From 10b32454ad5f8c522c7a3a96435444191d7de28d Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Tue, 6 Aug 2024 12:23:38 -0700 Subject: [PATCH] vkquake: move installation steps to installPhase --- pkgs/games/quakespasm/vulkan.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index f9206dce5dfb..2df8f1b83710 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -50,23 +50,22 @@ stdenv.mkDerivation rec { buildFlags = [ "DO_USERDIRS=1" ]; - preInstall = '' - mkdir -p "$out/bin" - ''; - env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; }; - postFixup = '' + installPhase = '' + mkdir -p "$out/bin" cp vkquake "$out/bin" + ''; + + postFixup = '' patchelf $out/bin/vkquake \ --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; meta = with lib; { description = "Vulkan Quake port based on QuakeSpasm"; - mainProgram = "vkquake"; homepage = src.meta.homepage; longDescription = '' vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering. @@ -79,5 +78,6 @@ stdenv.mkDerivation rec { platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ PopeRigby ylh ]; + mainProgram = "vkquake"; }; }