git.iko.soy/typeable/nixpkgs
on master help sign in
Move glslang and vulkan-validation-layers overrides out of all-packages
commit00946dc283ad0b3018490331802b77e16731a1f1 authorCâju Mihai-Drosi <cajum.bugs@yandex.com> dateWed 14 Oct 2020, 15:47 (6 years ago) parentbda92bf
3 files changed+87−55
pkgs/development/compilers/glslang/default.nix+34−4 pkgs/development/tools/vulkan-validation-layers/default.nix+51−6 pkgs/top-level/all-packages.nix+2−45
pkgs/development/compilers/glslang/default.nix+34−4
@@ -5,7 +5,36 @@
55, python3
66, spirv-headers
77, spirv-tools
8+, argSpirv-tools ? null
9+, argSpirv-headers ? null
810}:
11+# glslang requires custom versions of spirv-tools and spirb-headers.
12+# The exact versions are taken from:
13+# https://github.com/KhronosGroup/glslang/blob/master/known_good.json
14+
15+let
16+ localSpirv-tools = if argSpirv-tools == null
17+ then spirv-tools.overrideAttrs (_: {
18+ src = fetchFromGitHub {
19+ owner = "KhronosGroup";
20+ repo = "SPIRV-Tools";
21+ rev = "fd8e130510a6b002b28eee5885a9505040a9bdc9";
22+ sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";
23+ };
24+ })
25+ else argSpirv-tools;
26+
27+ localSpirv-headers = if argSpirv-headers == null
28+ then spirv-headers.overrideAttrs (_: {
29+ src = fetchFromGitHub {
30+ owner = "KhronosGroup";
31+ repo = "SPIRV-Headers";
32+ rev = "f8bf11a0253a32375c32cad92c841237b96696c0";
33+ sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l";
34+ };
35+ })
36+ else argSpirv-headers;
37+in
938
1039stdenv.mkDerivation rec {
1140 pname = "glslang";
@@ -20,22 +49,23 @@ stdenv.mkDerivation rec {
2049
2150 # These get set at all-packages, keep onto them for child drvs
2251 passthru = {
23− inherit spirv-tools spirv-headers;
52+ spirv-tools = localSpirv-tools;
53+ spirv-headers = localSpirv-headers;
2454 };
2555
2656 nativeBuildInputs = [ cmake python3 bison jq ];
2757 enableParallelBuilding = true;
2858
2959 postPatch = ''
30− cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools
31− ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers
60+ cp --no-preserve=mode -r "${localSpirv-tools.src}" External/spirv-tools
61+ ln -s "${localSpirv-headers.src}" External/spirv-tools/external/spirv-headers
3262 '';
3363
3464 # Ensure spirv-headers and spirv-tools match exactly to what is expected
3565 preConfigure = ''
3666 HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit')
3767 TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit')
38− if [ "$HEADERS_COMMIT" != "${spirv-headers.src.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then
68+ if [ "$HEADERS_COMMIT" != "${localSpirv-headers.src.rev}" ] || [ "$TOOLS_COMMIT" != "${localSpirv-tools.src.rev}" ]; then
3969 echo "ERROR: spirv-tools commits do not match expected versions: expected tools at $TOOLS_COMMIT, headers at $HEADERS_COMMIT";
4070 exit 1;
4171 fi
pkgs/development/tools/vulkan-validation-layers/default.nix+51−6
@@ -1,6 +1,51 @@
1−{ stdenv, fetchFromGitHub, cmake, writeText, python3
2−, vulkan-headers, vulkan-loader, glslang, spirv-headers
3−, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
1+{ stdenv
2+, fetchFromGitHub
3+, cmake
4+, writeText
5+, python3
6+, spirv-headers
7+, spirv-tools
8+, vulkan-headers
9+, vulkan-loader
10+, glslang
11+, pkgconfig
12+, xlibsWrapper
13+, libxcb
14+, libXrandr
15+, wayland
16+}:
17+# vulkan-validation-layers requires a custom glslang version, while glslang requires
18+# custom versions for spirv-tools and spirv-headers. The git hashes required for all
19+# of these deps is documented upstream here:
20+# https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/scripts/known_good.json
21+
22+let
23+ localGlslang = (glslang.override {
24+ argSpirv-tools = spirv-tools.overrideAttrs (_: {
25+ src = fetchFromGitHub {
26+ owner = "KhronosGroup";
27+ repo = "SPIRV-Tools";
28+ rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a";
29+ sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv";
30+ };
31+ });
32+ argSpirv-headers = spirv-headers.overrideAttrs (_: {
33+ src = fetchFromGitHub {
34+ owner = "KhronosGroup";
35+ repo = "SPIRV-Headers";
36+ rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be";
37+ sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx";
38+ };
39+ });
40+ }).overrideAttrs (_: {
41+ src = fetchFromGitHub {
42+ owner = "KhronosGroup";
43+ repo = "glslang";
44+ rev = "e00d27c6d65b7d3e72506a311d7f053da4051295";
45+ sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv";
46+ };
47+ });
48+in
449
550stdenv.mkDerivation rec {
651 pname = "vulkan-validation-layers";
@@ -20,8 +65,8 @@ stdenv.mkDerivation rec {
2065 ];
2166
2267 buildInputs = [
23− glslang
24− spirv-headers
68+ localGlslang
69+ localGlslang.spirv-headers
2570 vulkan-headers
2671 vulkan-loader
2772 libxcb
@@ -32,7 +77,7 @@ stdenv.mkDerivation rec {
3277 enableParallelBuilding = true;
3378
3479 cmakeFlags = [
35− "-DGLSLANG_INSTALL_DIR=${glslang}"
80+ "-DGLSLANG_INSTALL_DIR=${localGlslang}"
3681 ];
3782
3883 # Help vulkan-loader find the validation layers
pkgs/top-level/all-packages.nix+2−45
@@ -9094,24 +9094,7 @@ in
90949094
90959095 dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
90969096
9097− glslang = callPackage ../development/compilers/glslang {
9098− spirv-tools = spirv-tools.overrideAttrs (_: {
9099− src = fetchFromGitHub {
9100− owner = "KhronosGroup";
9101− repo = "SPIRV-Tools";
9102− rev = "fd8e130510a6b002b28eee5885a9505040a9bdc9";
9103− sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";
9104− };
9105− });
9106− spirv-headers = spirv-headers.overrideAttrs (_: {
9107− src = fetchFromGitHub {
9108− owner = "KhronosGroup";
9109− repo = "SPIRV-Headers";
9110− rev = "f8bf11a0253a32375c32cad92c841237b96696c0";
9111− sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l";
9112− };
9113− });
9114− };
9097+ glslang = callPackage ../development/compilers/glslang { };
91159098
91169099 go_bootstrap = if stdenv.isAarch64 then
91179100 srcOnly {
@@ -15818,33 +15801,7 @@ in
1581815801 vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
1581915802 vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
1582015803 vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };
15821− vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers {
15822− glslang = (glslang.override {
15823− spirv-tools = spirv-tools.overrideAttrs (_: {
15824− src = fetchFromGitHub {
15825− owner = "KhronosGroup";
15826− repo = "SPIRV-Tools";
15827− rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a";
15828− sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv";
15829− };
15830− });
15831− spirv-headers = spirv-tools.overrideAttrs (_: {
15832− src = fetchFromGitHub {
15833− owner = "KhronosGroup";
15834− repo = "SPIRV-Headers";
15835− rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be";
15836− sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx";
15837− };
15838− });
15839− }).overrideAttrs (_: {
15840− src = fetchFromGitHub {
15841− owner = "KhronosGroup";
15842− repo = "glslang";
15843− rev = "e00d27c6d65b7d3e72506a311d7f053da4051295";
15844− sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv";
15845− };
15846− });
15847− };
15804+ vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
1584815805
1584915806 vtkWithQt5 = vtk.override { qtLib = qt514; };
1585015807