diff options
| author | Benjamin Saunders <ben.e.saunders@gmail.com> | 2019-02-17 09:56:48 -0800 |
|---|---|---|
| committer | Benjamin Saunders <ben.e.saunders@gmail.com> | 2019-03-20 18:04:43 -0700 |
| commit | 11988d7336956dfa3a2a4466ca9392313e0e4be1 (patch) | |
| tree | 724ca10d0509de12ad817d73b319885ca7a399a6 /pkgs | |
| parent | 45a6b6878fd9da6b81ac1dac4df4ad88a8109e0e (diff) | |
| download | nixlib-11988d7336956dfa3a2a4466ca9392313e0e4be1.tar nixlib-11988d7336956dfa3a2a4466ca9392313e0e4be1.tar.gz nixlib-11988d7336956dfa3a2a4466ca9392313e0e4be1.tar.bz2 nixlib-11988d7336956dfa3a2a4466ca9392313e0e4be1.tar.lz nixlib-11988d7336956dfa3a2a4466ca9392313e0e4be1.tar.xz nixlib-11988d7336956dfa3a2a4466ca9392313e0e4be1.tar.zst nixlib-11988d7336956dfa3a2a4466ca9392313e0e4be1.zip | |
vulkan-validation-layers: 1.1.85.0 -> 1.1.101.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/vulkan-validation-layers/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 28 |
2 files changed, 30 insertions, 5 deletions
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index c76c670739e1..702b7a564b22 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, writeText, python3 +{ stdenv, callPackage, fetchFromGitHub, cmake, writeText, python3 , vulkan-headers, vulkan-loader, glslang , pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: - stdenv.mkDerivation rec { name = "vulkan-validation-layers-${version}"; - version = "1.1.85.0"; + version = "1.1.101.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json! src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - sha256 = "1y5ny587h62139fxnz760hsyv1dmw29m1a9vq096sn8qafh3jzbz"; + sha256 = "00gz72m393i3m3rh5hv9d0znzlz39cpw35ifchzb4cr11bi4mzyz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5513766ddaf6..df1e62bf0211 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12956,7 +12956,33 @@ in vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; - vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; + vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { + glslang = (glslang.override { + spirv-tools = spirv-tools.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "5994ae2a045015004cce24802dc47c33736486ea"; + sha256 = "1w1zkql03aggma31nz4xb1b5waxxf2jcg99slzvmihg9ngmmlbm6"; + }; + }); + spirv-headers = spirv-tools.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; + sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + }; + }); + }).overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "5432f0dd8f331f15182681664d7486681e8514e6"; + sha256 = "0spdm93qkx83z8bks61am2g3ary7fkibvhqq706nj4z9wx4k0cbm"; + }; + }); + }; vtkWithQt4 = vtk.override { qtLib = qt4; }; |