diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-08-31 11:45:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-31 11:45:50 -0400 |
commit | 6951cbeea912839e4f79a41a46228668a03a0966 (patch) | |
tree | 87d4b2d5309b2276ac895ded88de60000f7ea7a6 /pkgs/development/compilers | |
parent | c4adeddb5f8e945517068968d06ea838b7c24bd3 (diff) | |
parent | 96a64ff735c61be49f42aa6ae5e44998658a7d65 (diff) |
Merge pull request #66238 from jonringer/update-vulkan
Update vulkan packages
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/glslang/default.nix | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 3c46dfc107b8c..161e57b547929 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') |