diff options
| author | Yestin L. Harrison <yestin@ylh.io> | 2022-07-30 07:56:32 -0700 |
|---|---|---|
| committer | Yestin L. Harrison <yestin@ylh.io> | 2022-08-03 13:58:54 -0700 |
| commit | 6237fcac982fc233bd8438863c1a7d121a548188 (patch) | |
| tree | ec142e5ea6fd79699f32c755d64f99fb5d240784 | |
| parent | 62af94c2ce5b43e4d56d3817f801cb87807b3660 (diff) | |
vkquake: support darwin
| -rw-r--r-- | pkgs/games/quakespasm/vulkan.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index a6aadef7a576..eedab296ce93 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: +{ lib, stdenv, fetchFromGitHub, makeWrapper +, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader, moltenvk +}: stdenv.mkDerivation rec { pname = "vkquake"; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { libvorbis libmad vulkan-loader - ]; + ] ++ lib.optional stdenv.isDarwin moltenvk; buildFlags = [ "DO_USERDIRS=1" ]; @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { specialization constants, CPU/GPU parallelism and memory pooling. ''; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ ylh ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f07807ade1d8..b73e4128a1c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32900,7 +32900,9 @@ with pkgs; quakespasm = callPackage ../games/quakespasm { inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio CoreFoundation IOKit OpenGL; }; - vkquake = callPackage ../games/quakespasm/vulkan.nix { }; + vkquake = callPackage ../games/quakespasm/vulkan.nix { + inherit (darwin) moltenvk; + }; ioquake3 = callPackage ../games/quake3/ioquake { }; quake3e = callPackage ../games/quake3/quake3e { }; |