diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 18:04:31 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 18:04:31 +0200 |
| commit | 96e5474329a3c2b2309872fb01b007daaf6d7bdc (patch) | |
| tree | a5493889e970cb255749576723666ce77d513cf1 /pkgs/development/libraries/vulkan-loader/default.nix | |
| parent | 4b515cf6ef45299028b9c641c0cec3df006f8709 (diff) | |
| parent | cbbe9f0f211a7c96e7daa7a6e9242b46f841fff2 (diff) | |
| download | nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.gz nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.bz2 nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.lz nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.xz nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.zst nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/vulkan-loader/default.nix')
| -rw-r--r-- | pkgs/development/libraries/vulkan-loader/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index d8b94c40c7e..5631665a691 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -2,7 +2,7 @@ , xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: let - version = "1.1.106"; + version = "1.1.114.0"; in assert version == vulkan-headers.version; @@ -14,17 +14,15 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - sha256 = "0zhrwj1gi90x2w8gaaaw5h4b969a8gfy244kn0drrplhhb1nqz3b"; + sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww"; }; nativeBuildInputs = [ pkgconfig addOpenGLRunpath ]; buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; - patches = [ ./system-search-path.patch ]; - cmakeFlags = [ - "-DSYSTEM_SEARCH_PATH=${addOpenGLRunpath.driverLink}/share" + "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" ]; |