git.iko.soy/typeable/nixpkgs
on master help sign in
vulkan-loader: enable support for Darwin
commitb7633995740deaeafc07c5e0e1f0aa8e05313bc8 authorRandy Eckenrode <randy@largeandhighquality.com> dateTue 15 Feb 2022, 20:25 (5 years ago) parentf138abf
2 files changed+8−8
pkgs/development/libraries/vulkan-loader/default.nix+7−7 pkgs/top-level/all-packages.nix+1−1
pkgs/development/libraries/vulkan-loader/default.nix+7−7
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb
2−, libXrandr, wayland, vulkan-headers, addOpenGLRunpath }:
2+, libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath }:
33
44stdenv.mkDerivation rec {
55 pname = "vulkan-loader";
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
1414 });
1515
1616 nativeBuildInputs = [ cmake pkg-config ];
17− buildInputs = [ libX11 libxcb libXrandr vulkan-headers wayland ];
17+ buildInputs = [ vulkan-headers ]
18+ ++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ];
1819
19− cmakeFlags = [
20− "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
21− "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include"
22− ];
20+ cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]
21+ ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share"
22+ ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share";
2323
2424 outputs = [ "out" "dev" ];
2525
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 meta = with lib; {
3636 description = "LunarG Vulkan loader";
3737 homepage = "https://www.lunarg.com";
38− platforms = platforms.linux;
38+ platforms = platforms.linux ++ platforms.darwin;
3939 license = licenses.asl20;
4040 maintainers = [ maintainers.ralith ];
4141 };
pkgs/top-level/all-packages.nix+1−1
@@ -20398,7 +20398,7 @@ with pkgs;
2039820398
2039920399 vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { };
2040020400 vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
20401− vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
20401+ vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; };
2040220402 vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };
2040320403 vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
2040420404 vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };