Unverified Commit 94cfcf79 authored by Ben Siraphob's avatar Ben Siraphob Committed by GitHub
Browse files

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

parents ebbb3a74 6237fcac

pkgs/games/quakespasm/vulkan.nix

+6 −4
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -32938,7 +32938,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 { };