diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 18:04:31 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 18:04:31 +0200 |
| commit | 96e5474329a3c2b2309872fb01b007daaf6d7bdc (patch) | |
| tree | a5493889e970cb255749576723666ce77d513cf1 /pkgs/development/tools/spirv-tools | |
| parent | 4b515cf6ef45299028b9c641c0cec3df006f8709 (diff) | |
| parent | cbbe9f0f211a7c96e7daa7a6e9242b46f841fff2 (diff) | |
| download | nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.gz nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.bz2 nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.lz nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.xz nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.tar.zst nixpkgs-96e5474329a3c2b2309872fb01b007daaf6d7bdc.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/spirv-tools')
| -rw-r--r-- | pkgs/development/tools/spirv-tools/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index b44eaaf2d7d..550cd9dce27 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake, python, spirv-headers }: +{ stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: let # Update spirv-headers rev in lockstep according to DEPs file - version = "2019.1"; + version = "2019.3"; in -assert version == spirv-headers.version; stdenv.mkDerivation rec { pname = "spirv-tools"; inherit version; @@ -13,11 +12,11 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "v${version}"; - sha256 = "0vddjzhkrhrm3l3i57nxmq2smv3r1s0ka5ff2kziaahr4hqb479r"; + sha256 = "1wvipjcjsi815ls08s3dz9hwlbb59dbl4syxkskg1k9d5jjph1a8"; }; enableParallelBuilding = true; - buildInputs = [ cmake python ]; + buildInputs = [ cmake python3 ]; cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ]; |