pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #183981 from ylh/patch-vkquake-darwin

authored by Ben Siraphob and committed by GitHub 94cfcf79 ebbb3a74

+9 -5
unified split
+6 -4
pkgs/games/quakespasm/vulkan.nix
··· 1 - { lib, stdenv, fetchFromGitHub, makeWrapper, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: 1 + { lib, stdenv, fetchFromGitHub, makeWrapper 2 + , SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader, moltenvk 3 + }: 2 4 3 5 stdenv.mkDerivation rec { 4 6 pname = "vkquake"; ··· 24 26 libvorbis 25 27 libmad 26 28 vulkan-loader 27 - ]; 29 + ] ++ lib.optional stdenv.isDarwin moltenvk; 28 30 29 31 buildFlags = [ "DO_USERDIRS=1" ]; 30 32 ··· 53 55 specialization constants, CPU/GPU parallelism and memory pooling. 54 56 ''; 55 57 56 - platforms = platforms.linux; 57 - maintainers = with maintainers; [ ]; 58 + platforms = with platforms; linux ++ darwin; 59 + maintainers = with maintainers; [ ylh ]; 58 60 }; 59 61 }
+3 -1
pkgs/top-level/all-packages.nix
··· 32938 32938 quakespasm = callPackage ../games/quakespasm { 32939 32939 inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio CoreFoundation IOKit OpenGL; 32940 32940 }; 32941 - vkquake = callPackage ../games/quakespasm/vulkan.nix { }; 32941 + vkquake = callPackage ../games/quakespasm/vulkan.nix { 32942 + inherit (darwin) moltenvk; 32943 + }; 32942 32944 32943 32945 ioquake3 = callPackage ../games/quake3/ioquake { }; 32944 32946 quake3e = callPackage ../games/quake3/quake3e { };