From b7633995740deaeafc07c5e0e1f0aa8e05313bc8 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 15 Feb 2022 20:25:41 -0500 Subject: vulkan-loader: enable support for Darwin --- pkgs/development/libraries/vulkan-loader/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/development/libraries/vulkan-loader/default.nix') 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 ]; }; -- cgit 1.4.1