jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan-validation-layers: 1.1.85.0 -> 1.1.101.0

Browse Source
This commit is contained in:
Benjamin Saunders 2019-02-17 09:56:48 -08:00
parent 45a6b6878f
commit 11988d7336
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/vulkan-validation-layers/default.nix
View File

@ -1,16 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, writeText, python3 { stdenv, callPackage, fetchFromGitHub, cmake, writeText, python3
, vulkan-headers, vulkan-loader, glslang , vulkan-headers, vulkan-loader, glslang
, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: , pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vulkan-validation-layers-${version}"; 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 { src = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers"; repo = "Vulkan-ValidationLayers";
rev = "sdk-${version}"; rev = "sdk-${version}";
sha256 = "1y5ny587h62139fxnz760hsyv1dmw29m1a9vq096sn8qafh3jzbz"; sha256 = "00gz72m393i3m3rh5hv9d0znzlz39cpw35ifchzb4cr11bi4mzyz";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

28
pkgs/top-level/all-packages.nix
View File

@ -12956,7 +12956,33 @@ in
vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; 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; }; vtkWithQt4 = vtk.override { qtLib = qt4; };