diff options
author | Randy Eckenrode <randy@largeandhighquality.com> | 2022-02-15 20:25:41 -0500 |
---|---|---|
committer | Randy Eckenrode <randy@largeandhighquality.com> | 2022-02-16 17:36:50 -0500 |
commit | b7633995740deaeafc07c5e0e1f0aa8e05313bc8 (patch) | |
tree | a2d5a67b4eb94320863ce7f5f9c6100c60e8551f | |
parent | f138abff3dcb9234586966f09a1ca8bbbc793eba (diff) | |
download | nixpkgs-b7633995740deaeafc07c5e0e1f0aa8e05313bc8.tar nixpkgs-b7633995740deaeafc07c5e0e1f0aa8e05313bc8.tar.gz nixpkgs-b7633995740deaeafc07c5e0e1f0aa8e05313bc8.tar.bz2 nixpkgs-b7633995740deaeafc07c5e0e1f0aa8e05313bc8.tar.lz nixpkgs-b7633995740deaeafc07c5e0e1f0aa8e05313bc8.tar.xz nixpkgs-b7633995740deaeafc07c5e0e1f0aa8e05313bc8.tar.zst nixpkgs-b7633995740deaeafc07c5e0e1f0aa8e05313bc8.zip |
vulkan-loader: enable support for Darwin
-rw-r--r-- | pkgs/development/libraries/vulkan-loader/default.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index e598d2c864b..34efda7ad09 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb -, libXrandr, wayland, vulkan-headers, addOpenGLRunpath }: +, libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "vulkan-loader"; @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }); nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libX11 libxcb libXrandr vulkan-headers wayland ]; + buildInputs = [ vulkan-headers ] + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ]; - cmakeFlags = [ - "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" - "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" - ]; + cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] + ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" + ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"; outputs = [ "out" "dev" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LunarG Vulkan loader"; homepage = "https://www.lunarg.com"; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1648d87b0a..c63ecaf8df6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20398,7 +20398,7 @@ with pkgs; vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; - vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; + vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; |