public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spirv-tools: 2018-09-20 -> 2019.1

Browse Source
This commit is contained in:
Benjamin Saunders 2019-02-17 09:52:50 -08:00
parent 94b2a0fc6b
commit d8d8a7a3eb
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/development/tools/spirv-tools/default.nix
View File

@ -1,38 +1,25 @@
{ stdenv, fetchFromGitHub, cmake, python }: { stdenv, fetchFromGitHub, cmake, python, spirv-headers }:
let let
# Update spirv-headers rev in lockstep according to DEPs file
spirv_sources = { version = "2019.1";
# `glslang` requires a specific version of `spirv-tools` and `spirv-headers` as specified in `known-good.json`.
tools = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "9bfe0eb25e3dfdf4f3fd86ab6c0cda009c9bd661";
sha256 = "1spfii4zib1lmz40vnz1d1cr6is7q2n7rvar1vfzi33gwrn8rqhi";
};
headers = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
rev = "d5b2e1255f706ce1f88812217e9a554f299848af";
sha256 = "18530mpa030ckjhn78z9vbfd35l5jgh3mg22ra6k8gw8zx4wjhsl";
};
};
in in
assert version == spirv-headers.version;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "spirv-tools-${version}"; name = "spirv-tools-${version}";
version = "2018-09-20"; inherit version;
src = spirv_sources.tools; src = fetchFromGitHub {
patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "v${version}";
sha256 = "0vddjzhkrhrm3l3i57nxmq2smv3r1s0ka5ff2kziaahr4hqb479r";
};
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ cmake python ]; buildInputs = [ cmake python ];
passthru = { cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ];
headers = spirv_sources.headers;
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit (src.meta) homepage; inherit (src.meta) homepage;