vulkan-validation-layers: fix hash, update spirv-headers to fix build
This commit is contained in:
parent
e9465b7bf0
commit
0cb697b2df
|
@ -13,13 +13,30 @@
|
||||||
, libXdmcp
|
, libXdmcp
|
||||||
, libXrandr
|
, libXrandr
|
||||||
, spirv-headers
|
, spirv-headers
|
||||||
, spirv-tools
|
|
||||||
, vulkan-headers
|
, vulkan-headers
|
||||||
, wayland
|
, wayland
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
robin-hood-hashing = callPackage ./robin-hood-hashing.nix {};
|
robin-hood-hashing = callPackage ./robin-hood-hashing.nix {};
|
||||||
|
|
||||||
|
# Current VVL version requires a newer spirv-headers than the latest release tag.
|
||||||
|
# This should hopefully not be too common and the override should be removed after
|
||||||
|
# the next SPIRV headers release.
|
||||||
|
# FIXME: if this ever becomes common, figure out a way to pull revisions directly
|
||||||
|
# from upstream known-good.json
|
||||||
|
spirv-headers' = spirv-headers.overrideAttrs(_: {
|
||||||
|
version = "unstable-2023-04-27";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "KhronosGroup";
|
||||||
|
repo = "SPIRV-Headers";
|
||||||
|
rev = "7f1d2f4158704337aff1f739c8e494afc5716e7e";
|
||||||
|
hash = "sha256-DHOYIZQqP5uWDYdb+vePpMBaQDOCB5Pcg8wPBMF8itk=";
|
||||||
|
};
|
||||||
|
|
||||||
|
postPatch = "";
|
||||||
|
});
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vulkan-validation-layers";
|
pname = "vulkan-validation-layers";
|
||||||
|
@ -34,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "Vulkan-ValidationLayers";
|
repo = "Vulkan-ValidationLayers";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-viVceH8qFz6Cl/RlMMWZnMIdzULELlnIvtPZ87ySs2M=";
|
hash = "sha256-+Vjy3hzzpC+bFNSEHLsfUaaHMSrMv2G+B8lGjui0fJs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -50,14 +67,13 @@ stdenv.mkDerivation rec {
|
||||||
libXrandr
|
libXrandr
|
||||||
libffi
|
libffi
|
||||||
libxcb
|
libxcb
|
||||||
spirv-tools
|
|
||||||
vulkan-headers
|
vulkan-headers
|
||||||
wayland
|
wayland
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DGLSLANG_INSTALL_DIR=${glslang}"
|
"-DGLSLANG_INSTALL_DIR=${glslang}"
|
||||||
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
|
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers'}"
|
||||||
"-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"
|
"-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"
|
||||||
"-DBUILD_LAYER_SUPPORT_FILES=ON"
|
"-DBUILD_LAYER_SUPPORT_FILES=ON"
|
||||||
"-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"
|
"-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"
|
||||||
|
@ -84,6 +100,5 @@ stdenv.mkDerivation rec {
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = [ maintainers.ralith ];
|
maintainers = [ maintainers.ralith ];
|
||||||
broken = (lib.all (pkg: pkg.version != version) [vulkan-headers glslang spirv-tools spirv-headers]);
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue