Move glslang and vulkan-validation-layers overrides out of all-packages
parent
bda92bfad0
commit
00946dc283
|
@ -5,7 +5,36 @@
|
||||||
, python3
|
, python3
|
||||||
, spirv-headers
|
, spirv-headers
|
||||||
, spirv-tools
|
, spirv-tools
|
||||||
|
, argSpirv-tools ? null
|
||||||
|
, argSpirv-headers ? null
|
||||||
}:
|
}:
|
||||||
|
# glslang requires custom versions of spirv-tools and spirb-headers.
|
||||||
|
# The exact versions are taken from:
|
||||||
|
# https://github.com/KhronosGroup/glslang/blob/master/known_good.json
|
||||||
|
|
||||||
|
let
|
||||||
|
localSpirv-tools = if argSpirv-tools == null
|
||||||
|
then spirv-tools.overrideAttrs (_: {
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "KhronosGroup";
|
||||||
|
repo = "SPIRV-Tools";
|
||||||
|
rev = "fd8e130510a6b002b28eee5885a9505040a9bdc9";
|
||||||
|
sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";
|
||||||
|
};
|
||||||
|
})
|
||||||
|
else argSpirv-tools;
|
||||||
|
|
||||||
|
localSpirv-headers = if argSpirv-headers == null
|
||||||
|
then spirv-headers.overrideAttrs (_: {
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "KhronosGroup";
|
||||||
|
repo = "SPIRV-Headers";
|
||||||
|
rev = "f8bf11a0253a32375c32cad92c841237b96696c0";
|
||||||
|
sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l";
|
||||||
|
};
|
||||||
|
})
|
||||||
|
else argSpirv-headers;
|
||||||
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "glslang";
|
pname = "glslang";
|
||||||
|
@ -20,22 +49,23 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
# These get set at all-packages, keep onto them for child drvs
|
# These get set at all-packages, keep onto them for child drvs
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit spirv-tools spirv-headers;
|
spirv-tools = localSpirv-tools;
|
||||||
|
spirv-headers = localSpirv-headers;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake python3 bison jq ];
|
nativeBuildInputs = [ cmake python3 bison jq ];
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools
|
cp --no-preserve=mode -r "${localSpirv-tools.src}" External/spirv-tools
|
||||||
ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers
|
ln -s "${localSpirv-headers.src}" External/spirv-tools/external/spirv-headers
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Ensure spirv-headers and spirv-tools match exactly to what is expected
|
# Ensure spirv-headers and spirv-tools match exactly to what is expected
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit')
|
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')
|
TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit')
|
||||||
if [ "$HEADERS_COMMIT" != "${spirv-headers.src.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then
|
if [ "$HEADERS_COMMIT" != "${localSpirv-headers.src.rev}" ] || [ "$TOOLS_COMMIT" != "${localSpirv-tools.src.rev}" ]; then
|
||||||
echo "ERROR: spirv-tools commits do not match expected versions: expected tools at $TOOLS_COMMIT, headers at $HEADERS_COMMIT";
|
echo "ERROR: spirv-tools commits do not match expected versions: expected tools at $TOOLS_COMMIT, headers at $HEADERS_COMMIT";
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,6 +1,51 @@
|
||||||
{ stdenv, fetchFromGitHub, cmake, writeText, python3
|
{ stdenv
|
||||||
, vulkan-headers, vulkan-loader, glslang, spirv-headers
|
, fetchFromGitHub
|
||||||
, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
|
, cmake
|
||||||
|
, writeText
|
||||||
|
, python3
|
||||||
|
, spirv-headers
|
||||||
|
, spirv-tools
|
||||||
|
, vulkan-headers
|
||||||
|
, vulkan-loader
|
||||||
|
, glslang
|
||||||
|
, pkgconfig
|
||||||
|
, xlibsWrapper
|
||||||
|
, libxcb
|
||||||
|
, libXrandr
|
||||||
|
, wayland
|
||||||
|
}:
|
||||||
|
# vulkan-validation-layers requires a custom glslang version, while glslang requires
|
||||||
|
# custom versions for spirv-tools and spirv-headers. The git hashes required for all
|
||||||
|
# of these deps is documented upstream here:
|
||||||
|
# https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/scripts/known_good.json
|
||||||
|
|
||||||
|
let
|
||||||
|
localGlslang = (glslang.override {
|
||||||
|
argSpirv-tools = spirv-tools.overrideAttrs (_: {
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "KhronosGroup";
|
||||||
|
repo = "SPIRV-Tools";
|
||||||
|
rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a";
|
||||||
|
sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
argSpirv-headers = spirv-headers.overrideAttrs (_: {
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "KhronosGroup";
|
||||||
|
repo = "SPIRV-Headers";
|
||||||
|
rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be";
|
||||||
|
sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}).overrideAttrs (_: {
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "KhronosGroup";
|
||||||
|
repo = "glslang";
|
||||||
|
rev = "e00d27c6d65b7d3e72506a311d7f053da4051295";
|
||||||
|
sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vulkan-validation-layers";
|
pname = "vulkan-validation-layers";
|
||||||
|
@ -20,8 +65,8 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glslang
|
localGlslang
|
||||||
spirv-headers
|
localGlslang.spirv-headers
|
||||||
vulkan-headers
|
vulkan-headers
|
||||||
vulkan-loader
|
vulkan-loader
|
||||||
libxcb
|
libxcb
|
||||||
|
@ -32,7 +77,7 @@ stdenv.mkDerivation rec {
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DGLSLANG_INSTALL_DIR=${glslang}"
|
"-DGLSLANG_INSTALL_DIR=${localGlslang}"
|
||||||
];
|
];
|
||||||
|
|
||||||
# Help vulkan-loader find the validation layers
|
# Help vulkan-loader find the validation layers
|
||||||
|
|
|
@ -9094,24 +9094,7 @@ in
|
||||||
|
|
||||||
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
|
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 = "fd8e130510a6b002b28eee5885a9505040a9bdc9";
|
|
||||||
sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
spirv-headers = spirv-headers.overrideAttrs (_: {
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "KhronosGroup";
|
|
||||||
repo = "SPIRV-Headers";
|
|
||||||
rev = "f8bf11a0253a32375c32cad92c841237b96696c0";
|
|
||||||
sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
go_bootstrap = if stdenv.isAarch64 then
|
go_bootstrap = if stdenv.isAarch64 then
|
||||||
srcOnly {
|
srcOnly {
|
||||||
|
@ -15818,33 +15801,7 @@ in
|
||||||
vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
|
vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
|
||||||
vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
|
vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
|
||||||
vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };
|
vulkan-tools = callPackage ../tools/graphics/vulkan-tools { };
|
||||||
vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers {
|
vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
|
||||||
glslang = (glslang.override {
|
|
||||||
spirv-tools = spirv-tools.overrideAttrs (_: {
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "KhronosGroup";
|
|
||||||
repo = "SPIRV-Tools";
|
|
||||||
rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a";
|
|
||||||
sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
spirv-headers = spirv-tools.overrideAttrs (_: {
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "KhronosGroup";
|
|
||||||
repo = "SPIRV-Headers";
|
|
||||||
rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be";
|
|
||||||
sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}).overrideAttrs (_: {
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "KhronosGroup";
|
|
||||||
repo = "glslang";
|
|
||||||
rev = "e00d27c6d65b7d3e72506a311d7f053da4051295";
|
|
||||||
sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
vtkWithQt5 = vtk.override { qtLib = qt514; };
|
vtkWithQt5 = vtk.override { qtLib = qt514; };
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue