mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-29 16:40:18 +02:00
vulkan-validation-layers: 1.2.131.2 -> 1.2.141.0
This commit is contained in:
parent
9efc9c8e2d
commit
926152f16b
|
@ -1,23 +1,39 @@
|
||||||
{ stdenv, fetchFromGitHub, cmake, writeText, python3
|
{ stdenv, fetchFromGitHub, cmake, writeText, python3
|
||||||
, vulkan-headers, vulkan-loader, glslang
|
, vulkan-headers, vulkan-loader, glslang, spirv-headers
|
||||||
, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
|
, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vulkan-validation-layers";
|
pname = "vulkan-validation-layers";
|
||||||
version = "1.2.131.2";
|
version = "1.2.141.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "Vulkan-ValidationLayers";
|
repo = "Vulkan-ValidationLayers";
|
||||||
rev = "sdk-${version}";
|
rev = "sdk-${version}";
|
||||||
sha256 = "1sz0388cr018ldx6ziplvk4v3zbg44pww77kv6kv5wxl69plwfcn";
|
sha256 = "1yfas7q122kx74nbjk3wxlyacysgncvlvq081a5dp238m88vkmbj";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig cmake python3 ];
|
nativeBuildInputs = [
|
||||||
buildInputs = [ vulkan-headers vulkan-loader libxcb libXrandr wayland ];
|
pkgconfig
|
||||||
|
cmake
|
||||||
|
python3
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
glslang
|
||||||
|
spirv-headers
|
||||||
|
vulkan-headers
|
||||||
|
vulkan-loader
|
||||||
|
libxcb
|
||||||
|
libXrandr
|
||||||
|
wayland
|
||||||
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ];
|
cmakeFlags = [
|
||||||
|
"-DGLSLANG_INSTALL_DIR=${glslang}"
|
||||||
|
];
|
||||||
|
|
||||||
# Help vulkan-loader find the validation layers
|
# Help vulkan-loader find the validation layers
|
||||||
setupHook = writeText "setup-hook" ''
|
setupHook = writeText "setup-hook" ''
|
||||||
|
|
|
@ -15824,24 +15824,24 @@ in
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "SPIRV-Tools";
|
repo = "SPIRV-Tools";
|
||||||
rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6";
|
rev = "e128ab0d624ce7beb08eb9656bb260c597a46d0a";
|
||||||
sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv";
|
sha256 = "0jj8zrl3dh9fq71jc8msx3f3ifb2vjcb37nl0w4sa8sdhfff74pv";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
spirv-headers = spirv-tools.overrideAttrs (_: {
|
spirv-headers = spirv-tools.overrideAttrs (_: {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "SPIRV-Headers";
|
repo = "SPIRV-Headers";
|
||||||
rev = "204cd131c42b90d129073719f2766293ce35c081";
|
rev = "ac638f1815425403e946d0ab78bac71d2bdbf3be";
|
||||||
sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";
|
sha256 = "1lkhs7pxcrfkmiizcxl0w5ajx6swwjv7w3iq586ipgh571fc75gx";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}).overrideAttrs (_: {
|
}).overrideAttrs (_: {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "glslang";
|
repo = "glslang";
|
||||||
rev = "4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3";
|
rev = "e00d27c6d65b7d3e72506a311d7f053da4051295";
|
||||||
sha256 = "1dghz8zl774dx2xpa4dv8xhxirbylgyn6kx18ib4qirna1njp0zg";
|
sha256 = "00lzvzk613gpm1vsdxffmx52z3c52ijwvzk4sfhh95p71kdydhgv";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue