Merge pull request #229749 from K900/even-more-more-vulkan-updates
Even more more vulkan updates
This commit is contained in:
commit
3428bdf3c9
|
@ -13,13 +13,30 @@
|
|||
, libXdmcp
|
||||
, libXrandr
|
||||
, spirv-headers
|
||||
, spirv-tools
|
||||
, vulkan-headers
|
||||
, wayland
|
||||
}:
|
||||
|
||||
let
|
||||
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
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-validation-layers";
|
||||
|
@ -34,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-ValidationLayers";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-viVceH8qFz6Cl/RlMMWZnMIdzULELlnIvtPZ87ySs2M=";
|
||||
hash = "sha256-+Vjy3hzzpC+bFNSEHLsfUaaHMSrMv2G+B8lGjui0fJs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -50,14 +67,13 @@ stdenv.mkDerivation rec {
|
|||
libXrandr
|
||||
libffi
|
||||
libxcb
|
||||
spirv-tools
|
||||
vulkan-headers
|
||||
wayland
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGLSLANG_INSTALL_DIR=${glslang}"
|
||||
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
|
||||
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers'}"
|
||||
"-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"
|
||||
"-DBUILD_LAYER_SUPPORT_FILES=ON"
|
||||
"-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"
|
||||
|
@ -84,6 +100,5 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux;
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ralith ];
|
||||
broken = (lib.all (pkg: pkg.version != version) [vulkan-headers glslang spirv-tools spirv-headers]);
|
||||
};
|
||||
}
|
||||
|
|
|
@ -24,14 +24,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-tools-lunarg";
|
||||
# The version must match that in vulkan-headers
|
||||
version = "1.3.243.0";
|
||||
version = "1.3.249";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LunarG";
|
||||
repo = "VulkanTools";
|
||||
rev = "sdk-${version}";
|
||||
hash = "sha256-mvBP6wD1Z0VNLZ0mC4bA3i2IaBDtDr7K6XjHz4S3UA4=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yQE6tjUxIZEMspxDaO9AoSjoEHQl2eDAc0E/aVQZnxQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -102,6 +101,5 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux;
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.expipiplus1 ];
|
||||
broken = (version != vulkan-headers.version);
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue