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

glslang: 2018-09-26 -> 7.11.3113

This commit is contained in:
Benjamin Saunders 2019-02-17 09:54:25 -08:00
parent d8d8a7a3eb
commit 6066f72960
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/compilers/glslang/default.nix
View File

@ -1,35 +1,32 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, bison, spirv-tools, jq }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake, bison, jq, python, spirv-tools, spirv-headers }:
stdenv.mkDerivation rec {
name = "glslang-git-${version}";
version = "2018-09-26";
name = "glslang-${version}";
version = "7.11.3113";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "91ac4290bcf2cb930b4fb0981f09c00c0b6797e1";
sha256 = "0q477pm0n495acnss16ddlf82a6i5l2dfmvc7r8yi0bgmgpzi4av";
rev = "${version}";
sha256 = "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6";
};
buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs;
nativeBuildInputs = [ cmake python bison jq ];
enableParallelBuilding = true;
postPatch = ''
cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools
ln -s "${spirv-tools.headers}" External/spirv-tools/external/spirv-headers
ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers
'';
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')
if [ "$HEADERS_COMMIT" != "${spirv-tools.headers.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then
if [ "$HEADERS_COMMIT" != "${spirv-headers.src.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then
echo "ERROR: spirv-tools commits do not match expected versions: expected tools at $TOOLS_COMMIT, headers at $HEADERS_COMMIT";
exit 1;
fi
'';
doCheck = false; # fails 3 out of 3 tests (ctest)
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Khronos reference front-end for GLSL and ESSL";

19
pkgs/top-level/all-packages.nix
View File

@ -7052,7 +7052,24 @@ in
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
glslang = callPackage ../development/compilers/glslang { };
glslang = callPackage ../development/compilers/glslang {
spirv-tools = spirv-tools.overrideAttrs (_: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "117a1fd11f11e9bef9faa563c3d5156cc6ab529c";
sha256 = "1w5hb6sgy71g279wsghixxc75r7rsm7wki011mpz039q66827sym";
};
});
spirv-headers = spirv-tools.overrideAttrs (_: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f";
sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
};
});
};
go_bootstrap = if stdenv.isAarch64 then
srcOnly {