diff options
| author | Yestin L. Harrison | 2024-08-30 22:32:43 -0700 |
|---|---|---|
| committer | Yestin L. Harrison | 2024-08-30 22:39:05 -0700 |
| commit | 5a3c85275fdec48211545a66f67aff2348b35d22 (patch) | |
| tree | 7b7990b7d6a3e7e540fd96ca1b752a6fee4f5c6b /pkgs/games | |
| parent | e6c09b2d57259503b883a99d91984101be524366 (diff) | |
vkquake: fix on darwin
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/quakespasm/vulkan.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 458927bfcc88..32428107d850 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -14,6 +14,7 @@ gzip, libvorbis, libmad, + vulkan-headers, vulkan-loader, moltenvk, }: @@ -46,12 +47,18 @@ stdenv.mkDerivation rec { libvorbis opusfile vulkan-loader - ] ++ lib.optional stdenv.isDarwin moltenvk; + ] ++ lib.optionals stdenv.isDarwin [ + moltenvk + vulkan-headers + ]; buildFlags = [ "DO_USERDIRS=1" ]; env = lib.optionalAttrs stdenv.isDarwin { - NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + "-Wno-error=unused-but-set-variable" + "-Wno-error=implicit-const-int-float-conversion" + ]; }; installPhase = '' @@ -59,7 +66,7 @@ stdenv.mkDerivation rec { cp vkquake "$out/bin" ''; - postFixup = '' + postFixup = lib.optionalString (!stdenv.isDarwin) '' patchelf $out/bin/vkquake \ --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; |