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

Merge pull request #37684 from Ralith/vulkan

Browse Source 
vulkan-loader: 1.0.61.1 -> 1.1.70.0
This commit is contained in:
Jörg Thalheim
2018-04-04 11:18:22 +01:00
committed by GitHub
parent d0b98f73cd 3808369103
commit 1ba44cc957
4 changed files with 56 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,21 +1,35 @@
{ stdenv, fetchFromGitHub, cmake, bison }:
{ stdenv, fetchFromGitHub, cmake, bison, spirv-tools, jq }:
stdenv.mkDerivation rec {
name = "glslang-git-${version}";
version = "2017-08-31";
version = "2018-02-05";
# `vulkan-loader` requires a specific version of `glslang` as specified in
# `<vulkan-loader-repo>/external_revisions/glslang_revision`.
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "3a21c880500eac21cdf79bef5b80f970a55ac6af";
sha256 = "1i15m17r0acmzjrkybris2rgw15il05a4w5h7vhhsiyngcvajcyn";
rev = "2651ccaec8";
sha256 = "0x5x5i07n9g809rzf5jgw70mmwck31ishdmxnmi0wxx737jjqwaq";
};
buildInputs = [ cmake bison ];
buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs;
enableParallelBuilding = true;
patchPhase = ''
cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools
ln -s "${spirv-tools.headers}" 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
echo "ERROR: spirv-tools commits do not match expected versions";
exit 1;
fi
'';
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Khronos reference front-end for GLSL and ESSL";