diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2019-08-06 15:45:23 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-08-08 00:57:53 -0700 |
| commit | cf73f645501ef5be263955d940b4effb0b870d5a (patch) | |
| tree | 64c2a7943d07f1c0605f706e4a3e2323c649896a /pkgs | |
| parent | 19d91206e7fb22b93d866f6b7d3c99120299a3df (diff) | |
| download | nixpkgs-cf73f645501ef5be263955d940b4effb0b870d5a.tar nixpkgs-cf73f645501ef5be263955d940b4effb0b870d5a.tar.gz nixpkgs-cf73f645501ef5be263955d940b4effb0b870d5a.tar.bz2 nixpkgs-cf73f645501ef5be263955d940b4effb0b870d5a.tar.lz nixpkgs-cf73f645501ef5be263955d940b4effb0b870d5a.tar.xz nixpkgs-cf73f645501ef5be263955d940b4effb0b870d5a.tar.zst nixpkgs-cf73f645501ef5be263955d940b4effb0b870d5a.zip | |
glslang: 7.11.3113 -> 7.11.3214
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/glslang/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
2 files changed, 26 insertions, 12 deletions
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 3c46dfc107b..161e57b5479 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -1,16 +1,29 @@ -{ stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }: +{ stdenv, fetchFromGitHub +, bison +, cmake +, jq +, python3 +, spirv-headers +, spirv-tools +}: + stdenv.mkDerivation rec { - name = "glslang-${version}"; - version = "7.11.3113"; + pname = "glslang"; + version = "7.11.3214"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "${version}"; - sha256 = "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6"; + rev = version; + sha256 = "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins"; + }; + + # These get set at all-packages, keep onto them for child drvs + passthru = { + inherit spirv-tools spirv-headers; }; - nativeBuildInputs = [ cmake python bison jq ]; + nativeBuildInputs = [ cmake python3 bison jq ]; enableParallelBuilding = true; postPatch = '' @@ -18,6 +31,7 @@ stdenv.mkDerivation rec { ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers ''; + # Ensure spirv-headers and spirv-tools match exactly to what is expected preConfigure = '' HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit') TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 073e8fcb5c6..99e09962d8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7727,16 +7727,16 @@ in src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "117a1fd11f11e9bef9faa563c3d5156cc6ab529c"; - sha256 = "1w5hb6sgy71g279wsghixxc75r7rsm7wki011mpz039q66827sym"; + rev = "26c1b8878315a7a5c188df45e0bc236bb222b698"; + sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b"; }; }); - spirv-headers = spirv-tools.overrideAttrs (_: { + spirv-headers = spirv-headers.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; - repo = "SPIRV-Tools"; - rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; - sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + repo = "SPIRV-Headers"; + rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f"; + sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm"; }; }); }; |