git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #94049 from CajuM/vulkan-up
commit0826f2efaed5c64d3c574f87dd4dcf978207f576 authorDoron Behar <doron.behar@gmail.com> dateThu 15 Oct 2020, 09:53 (6 years ago) parent2a4607f00946dc
9 files changed+139−80
pkgs/development/compilers/glslang/default.nix+36−6 pkgs/development/compilers/shaderc/default.nix+8−8 pkgs/development/libraries/spirv-headers/default.nix+2−2 pkgs/development/libraries/vulkan-headers/default.nix+2−2 pkgs/development/libraries/vulkan-loader/default.nix+2−2 pkgs/development/tools/spirv-tools/default.nix+2−2 pkgs/development/tools/vulkan-validation-layers/default.nix+69−8 pkgs/tools/graphics/vulkan-tools/default.nix+16−5 pkgs/top-level/all-packages.nix+2−45
pkgs/development/compilers/glslang/default.nix+36−6
@@ -5,37 +5,67 @@
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";
12− version = "8.13.3559";
41+ version = "8.13.3743";
1342
1443 src = fetchFromGitHub {
1544 owner = "KhronosGroup";
1645 repo = "glslang";
1746 rev = version;
18− sha256 = "0waamlh2vqh1k40m169294xdlm0iqjkx2vis4qyxfki0r0cnsmnk";
47+ sha256 = "0d20wfpp2fmbnz1hnsjr9xc62lxpj86ik2qyviqbni0pqj212cry";
1948 };
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/compilers/shaderc/default.nix+8−8
@@ -8,24 +8,24 @@ let
88 glslang = fetchFromGitHub {
99 owner = "KhronosGroup";
1010 repo = "glslang";
11− rev = "3ed344dd784ecbbc5855e613786f3a1238823e56";
12− sha256 = "00s2arfvw78d9k9fmangqlkvkmkpqzrin3g91vfab4wr8srb09dx";
11+ rev = "3ee5f2f1d3316e228916788b300d786bb574d337";
12+ sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv";
1313 };
1414 spirv-tools = fetchFromGitHub {
1515 owner = "KhronosGroup";
1616 repo = "SPIRV-Tools";
17− rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6";
18− sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv";
17+ rev = "b63f0e5ed3e818870968ebf6af73317127fd07b0";
18+ sha256 = "1chv30azfp76nha428ivg4ixrij6d8pxj5kn3jam87gmkmgc9zhm";
1919 };
2020 spirv-headers = fetchFromGitHub {
2121 owner = "KhronosGroup";
2222 repo = "SPIRV-Headers";
23− rev = "204cd131c42b90d129073719f2766293ce35c081";
24− sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";
23+ rev = "979924c8bc839e4cb1b69d03d48398551f369ce7";
24+ sha256 = "07vyjlblpm4zhfds612h86lnz0qvrj5qqw5z2zzfa3m9fax7cm85";
2525 };
2626in stdenv.mkDerivation rec {
2727 pname = "shaderc";
28− version = "2019.1";
28+ version = "2020.2";
2929
3030 outputs = [ "out" "lib" "bin" "dev" "static" ];
3131
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
3333 owner = "google";
3434 repo = "shaderc";
3535 rev = "v${version}";
36− sha256 = "0x514rpignnb4vvl7wmijfakqc59986knjw3dh1zx0ah42xa7x37";
36+ sha256 = "1sxz8872x3rdlrhmbn83r1vniq4j51jnk0ka3447fq68il4myf1w";
3737 };
3838
3939 patchPhase = ''
pkgs/development/libraries/spirv-headers/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "spirv-headers";
5− version = "1.5.1";
5+ version = "1.5.3";
66
77 src = fetchFromGitHub {
88 owner = "KhronosGroup";
99 repo = "SPIRV-Headers";
1010 rev = version;
11− sha256 = "1fnd8qwss6pxcch5j9qi1pdz70828zxsg4m8apgrhyj0p9lm0rbg";
11+ sha256 = "069sivqajp7z4p44lmrz23lvf237xpkjxd4lzrg27836pwqcz9bj";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
pkgs/development/libraries/vulkan-headers/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, cmake }:
22stdenv.mkDerivation rec {
33 pname = "vulkan-headers";
4− version = "1.2.131.1";
4+ version = "1.2.141.0";
55
66 nativeBuildInputs = [ cmake ];
77
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 owner = "KhronosGroup";
1010 repo = "Vulkan-Headers";
1111 rev = "sdk-${version}";
12− sha256 = "1yf42c2cnhx1y4wkxsdl6g653xl2vvamhpkldz6jb4ca5wk03gxf";
12+ sha256 = "10nmx6y4llllfcczyfz76amd0vkqv09dj952d19zkzmmgcval7zq";
1313 };
1414
1515 meta = with stdenv.lib; {
pkgs/development/libraries/vulkan-loader/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "vulkan-loader";
6− version = "1.2.131.2";
6+ version = "1.2.141.0";
77
88 src = fetchFromGitHub {
99 owner = "KhronosGroup";
1010 repo = "Vulkan-Loader";
1111 rev = "sdk-${version}";
12− sha256 = "12n4mxc6db89258k8i47ql1zna7k94lkwv7lpxg39nm8ypa1ywrv";
12+ sha256 = "10fyg71dza6qakz5zdchccfn0zcr8b1zpfi2rqir6jpzcbi28kcj";
1313 };
1414
1515 nativeBuildInputs = [ pkgconfig cmake ];
pkgs/development/tools/spirv-tools/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, cmake, python3, spirv-headers }:
22let
33 # Update spirv-headers rev in lockstep according to DEPs file
4− version = "2019.4";
4+ version = "2020.2";
55in
66
77stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 owner = "KhronosGroup";
1313 repo = "SPIRV-Tools";
1414 rev = "v${version}";
15− sha256 = "17bbvhk4p42x4jlvcr5p9903xiiryw57c8yyfxmqik10s8601an9";
15+ sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";
1616 };
1717 enableParallelBuilding = true;
1818
pkgs/development/tools/vulkan-validation-layers/default.nix+69−8
@@ -1,23 +1,84 @@
1−{ stdenv, fetchFromGitHub, cmake, writeText, python3
2−, vulkan-headers, vulkan-loader, glslang
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";
7− version = "1.2.131.2";
52+ version = "1.2.141.0";
853
954 src = fetchFromGitHub {
1055 owner = "KhronosGroup";
1156 repo = "Vulkan-ValidationLayers";
1257 rev = "sdk-${version}";
13− sha256 = "1sz0388cr018ldx6ziplvk4v3zbg44pww77kv6kv5wxl69plwfcn";
58+ sha256 = "1yfas7q122kx74nbjk3wxlyacysgncvlvq081a5dp238m88vkmbj";
1459 };
1560
16− nativeBuildInputs = [ pkgconfig cmake python3 ];
17− buildInputs = [ vulkan-headers vulkan-loader libxcb libXrandr wayland ];
61+ nativeBuildInputs = [
62+ pkgconfig
63+ cmake
64+ python3
65+ ];
66+
67+ buildInputs = [
68+ localGlslang
69+ localGlslang.spirv-headers
70+ vulkan-headers
71+ vulkan-loader
72+ libxcb
73+ libXrandr
74+ wayland
75+ ];
76+
1877 enableParallelBuilding = true;
1978
20− cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ];
79+ cmakeFlags = [
80+ "-DGLSLANG_INSTALL_DIR=${localGlslang}"
81+ ];
2182
2283 # Help vulkan-loader find the validation layers
2384 setupHook = writeText "setup-hook" ''
pkgs/tools/graphics/vulkan-tools/default.nix+16−5
@@ -1,22 +1,33 @@
1−{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, vulkan-headers,
2− glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
1+{ stdenv, lib, fetchFromGitHub, cmake, python3, vulkan-loader,
2+ vulkan-headers, glslang, pkgconfig, xlibsWrapper, libxcb,
3+ libXrandr, wayland }:
34
45stdenv.mkDerivation rec {
56 pname = "vulkan-tools";
6− version = "1.2.131.1";
7+ version = "1.2.141.0";
78
89 src = fetchFromGitHub {
910 owner = "KhronosGroup";
1011 repo = "Vulkan-Tools";
1112 rev = "sdk-${version}";
12− sha256 = "0ws47ansrr8cq4qjf6k4q0ygm9wwd3w7mhwqcl1qxms8lh5vmhfq";
13+ sha256 = "1ch56ihm7rmilipfyc4i4ww7l6i20fb3qikkpm1ch43kzn42zjaw";
1314 };
1415
1516 nativeBuildInputs = [ cmake pkgconfig ];
1617 buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
1718 enableParallelBuilding = true;
1819
19− cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ];
20+ libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];
21+
22+ dontPatchELF = true;
23+
24+ cmakeFlags = [
25+ # Don't build the mock ICD as it may get used instead of other drivers, if installed
26+ "-DBUILD_ICD=OFF"
27+ "-DGLSLANG_INSTALL_DIR=${glslang}"
28+ # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH
29+ "-DCMAKE_INSTALL_RPATH=${libraryPath}"
30+ ];
2031
2132 meta = with stdenv.lib; {
2233 description = "LunarG Vulkan loader";
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 = "5c019b5923c1f6bf00a3ac28114ec4a7b1faa0e2";
9103− sha256 = "17a0kiyb7zjsg7ws12diip84vds1ajl98ni9c2wria6ymcvbvsvz";
9104− };
9105− });
9106− spirv-headers = spirv-headers.overrideAttrs (_: {
9107− src = fetchFromGitHub {
9108− owner = "KhronosGroup";
9109− repo = "SPIRV-Headers";
9110− rev = "204cd131c42b90d129073719f2766293ce35c081";
9111− sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";
9112− };
9113− });
9114− };
9097+ glslang = callPackage ../development/compilers/glslang { };
91159098
91169099 go_bootstrap = if stdenv.isAarch64 then
91179100 srcOnly {
@@ -15884,33 +15867,7 @@ in
1588415867 vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
1588515868 vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
1588615869 vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };
15887− vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers {
15888− glslang = (glslang.override {
15889− spirv-tools = spirv-tools.overrideAttrs (_: {
15890− src = fetchFromGitHub {
15891− owner = "KhronosGroup";
15892− repo = "SPIRV-Tools";
15893− rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6";
15894− sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv";
15895− };
15896− });
15897− spirv-headers = spirv-tools.overrideAttrs (_: {
15898− src = fetchFromGitHub {
15899− owner = "KhronosGroup";
15900− repo = "SPIRV-Headers";
15901− rev = "204cd131c42b90d129073719f2766293ce35c081";
15902− sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";
15903− };
15904− });
15905− }).overrideAttrs (_: {
15906− src = fetchFromGitHub {
15907− owner = "KhronosGroup";
15908− repo = "glslang";
15909− rev = "4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3";
15910− sha256 = "1dghz8zl774dx2xpa4dv8xhxirbylgyn6kx18ib4qirna1njp0zg";
15911− };
15912− });
15913− };
15870+ vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
1591415871
1591515872 vtkWithQt5 = vtk.override { qtLib = qt514; };
1591615873