spirv-headers: 1.4.321.0 -> 1.4.321.0-unstable-2025-06-24; spirv-tools: 1.4.321.0 -> 1.4.321.0-unstable-2025-06-25 (#441808)
This commit is contained in:
@@ -7,13 +7,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spirv-headers";
|
||||
version = "1.4.321.0";
|
||||
version = "1.4.321.0-unstable-2025-06-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Headers";
|
||||
rev = "vulkan-sdk-${version}";
|
||||
hash = "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY=";
|
||||
# The release for Vulkan SDK 1.4.321.0 is missing a PR required for
|
||||
# LLVM 21 support in SPIRV-LLVM-Translator; return to the
|
||||
# `vulkan-sdk-*` tags on the next stable release.
|
||||
rev = "9e3836d7d6023843a72ecd3fbf3f09b1b6747a9e";
|
||||
hash = "sha256-N8NBAkkpOcbgap4loPJJW6E5bjG+TixCh/HN259RyjI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -133,13 +133,5 @@ stdenv.mkDerivation {
|
||||
license = licenses.ncsa;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ gloaming ];
|
||||
|
||||
# For the LLVM 21 build some commits to spirv-headers
|
||||
# are required that didn't make it into the final release of 1.4.321
|
||||
# For example: 9e3836d Add SPV_INTEL_function_variants
|
||||
# Once spirv-headers are released again and updated on nixpkgs,
|
||||
# this will switch over to the nixpkgs version and should no
|
||||
# longer be broken.
|
||||
broken = llvmMajor == "21" && lib.versionOlder spirv-headers.version "1.4.322";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spirv-tools";
|
||||
version = "1.4.321.0";
|
||||
version = "1.4.321.0-unstable-2025-06-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Tools";
|
||||
rev = "vulkan-sdk-${version}";
|
||||
hash = "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ=";
|
||||
# The SPIRV-Headers release for Vulkan SDK 1.4.321.0 is missing
|
||||
# a PR required for LLVM 21 support in SPIRV-LLVM-Translator;
|
||||
# return to the `vulkan-sdk-*` tags on the next stable release.
|
||||
rev = "28a883ba4c67f58a9540fb0651c647bb02883622";
|
||||
hash = "sha256-yRzpEBGyTr9oovsh3TUnJsR/luHNAPkotcJFWh7R1Fc=";
|
||||
};
|
||||
|
||||
# The cmake options are sufficient for turning on static building, but not
|
||||
|
||||
Reference in New Issue
Block a user