git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108526 from prusnak/glslang
0565ddeSandro
pkgs/development/compilers/glslang/default.nix+10−9
@@ -1,4 +1,5 @@
1+{ stdenv
1−{ stdenv, fetchFromGitHub
2+, fetchFromGitHub
2, bison
3, bison
3, cmake
4, cmake
4, jq
5, jq
@@ -10,7 +11,7 @@
10}:
11}:
11# glslang requires custom versions of spirv-tools and spirb-headers.
12# glslang requires custom versions of spirv-tools and spirb-headers.
12# The exact versions are taken from:
13# The exact versions are taken from:
13−# https://github.com/KhronosGroup/glslang/blob/master/known_good.json
14+# https://github.com/KhronosGroup/glslang/blob/${version}/known_good.json
14
15
15let
16let
16 localSpirv-tools = if argSpirv-tools == null
17 localSpirv-tools = if argSpirv-tools == null
@@ -18,8 +19,8 @@ let
18 src = fetchFromGitHub {
19 src = fetchFromGitHub {
19 owner = "KhronosGroup";
20 owner = "KhronosGroup";
20 repo = "SPIRV-Tools";
21 repo = "SPIRV-Tools";
21− rev = "fd8e130510a6b002b28eee5885a9505040a9bdc9";
22+ rev = "b27b1afd12d05bf238ac7368bb49de73cd620a8e";
22− sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";
23+ sha256 = "0v26ws6qx23jn4dcpsq6rqmdxgyxpl5pcvfm90wb3nz6iqbqx294";
23 };
24 };
24 })
25 })
25 else argSpirv-tools;
26 else argSpirv-tools;
@@ -29,8 +30,8 @@ let
29 src = fetchFromGitHub {
30 src = fetchFromGitHub {
30 owner = "KhronosGroup";
31 owner = "KhronosGroup";
31 repo = "SPIRV-Headers";
32 repo = "SPIRV-Headers";
32− rev = "f8bf11a0253a32375c32cad92c841237b96696c0";
33+ rev = "f027d53ded7e230e008d37c8b47ede7cd308e19d";
33− sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l";
34+ sha256 = "12gp2mqcar6jj57jw9isfr62yn72kmvdcl0zga4gvrlyfhnf582q";
34 };
35 };
35 })
36 })
36 else argSpirv-headers;
37 else argSpirv-headers;
@@ -38,13 +39,13 @@ in
38
39
39stdenv.mkDerivation rec {
40stdenv.mkDerivation rec {
40 pname = "glslang";
41 pname = "glslang";
41− version = "8.13.3743";
42+ version = "11.1.0";
42
43
43 src = fetchFromGitHub {
44 src = fetchFromGitHub {
44 owner = "KhronosGroup";
45 owner = "KhronosGroup";
45 repo = "glslang";
46 repo = "glslang";
46 rev = version;
47 rev = version;
47− sha256 = "0d20wfpp2fmbnz1hnsjr9xc62lxpj86ik2qyviqbni0pqj212cry";
48+ sha256 = "1j81pghy7whyr8ygk7lx6g6qph61rky7fkkc8xp87c7n695a48rw";
48 };
49 };
49
50
50 # These get set at all-packages, keep onto them for child drvs
51 # These get set at all-packages, keep onto them for child drvs
@@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
75 inherit (src.meta) homepage;
76 inherit (src.meta) homepage;
76 description = "Khronos reference front-end for GLSL and ESSL";
77 description = "Khronos reference front-end for GLSL and ESSL";
77 license = licenses.asl20;
78 license = licenses.asl20;
78− platforms = platforms.linux;
79+ platforms = platforms.unix;
79 maintainers = [ maintainers.ralith ];
80 maintainers = [ maintainers.ralith ];
80 };
81 };
81}
82}