Skip to content

shader-slang: 2025.8.1 -> 2025.12.1 #424153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niklaskorz merged 1 commit into from
Jul 11, 2025
Merged

shader-slang: 2025.8.1 -> 2025.12.1 #424153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions pkgs/by-name/sh/shader-slang/1-find-packages.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a933d0ab64..fced38bc32 100644
index 549e465ac..546c94607 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,6 +160,8 @@ advanced_option(
@@ -175,6 +175,8 @@ advanced_option(
"Build using system unordered dense"
OFF
)
Expand All @@ -11,7 +11,7 @@ index a933d0ab64..fced38bc32 100644

option(
SLANG_SPIRV_HEADERS_INCLUDE_DIR
@@ -386,6 +388,34 @@ if(${SLANG_USE_SYSTEM_UNORDERED_DENSE})
@@ -404,6 +406,34 @@ if(${SLANG_USE_SYSTEM_UNORDERED_DENSE})
find_package(unordered_dense CONFIG QUIET)
endif()

Expand Down Expand Up @@ -47,18 +47,18 @@ index a933d0ab64..fced38bc32 100644

# webgpu_dawn is only available as a fetched shared library, since Dawn's nested source
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 55d9e4941d..ff8a244651 100644
index 801cae4d6..d45150118 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -117,6 +117,7 @@ if(NOT ${SLANG_USE_SYSTEM_SPIRV_HEADERS})
endif()
@@ -133,6 +133,7 @@ if(SLANG_ENABLE_SLANG_GLSLANG)
)
endif()

if(SLANG_ENABLE_SLANG_GLSLANG)
+if(NOT ${SLANG_USE_SYSTEM_SPIRV_TOOLS})
# SPIRV-Tools
set(SPIRV_TOOLS_BUILD_STATIC ON)
set(SPIRV_WERROR OFF)
@@ -138,11 +139,14 @@ if(SLANG_ENABLE_SLANG_GLSLANG)
@@ -148,11 +149,14 @@ if(SLANG_ENABLE_SLANG_GLSLANG)
${system}
)
endif()
Expand All @@ -73,7 +73,7 @@ index 55d9e4941d..ff8a244651 100644
if(NOT SLANG_OVERRIDE_GLSLANG_PATH)
add_subdirectory(glslang EXCLUDE_FROM_ALL ${system})
else()
@@ -154,6 +158,7 @@ if(SLANG_ENABLE_SLANG_GLSLANG)
@@ -164,6 +168,7 @@ if(SLANG_ENABLE_SLANG_GLSLANG)
)
endif()
endif()
Expand Down
8 changes: 6 additions & 2 deletions pkgs/by-name/sh/shader-slang/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

stdenv.mkDerivation (finalAttrs: {
pname = "shader-slang";
version = "2025.8.1";
version = "2025.12.1";

src = fetchFromGitHub {
owner = "shader-slang";
repo = "slang";
tag = "v${finalAttrs.version}";
hash = "sha256-PScbMkJJ4rh8I8ID709GKtLmd5+4Z2x2BlFEdWpoesI=";
hash = "sha256-5M/sKoCFVGW4VcOPzL8dVhTuo+esjINPXw76fnO7OEw=";
fetchSubmodules = true;
};

Expand Down Expand Up @@ -131,6 +131,10 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optional (!withGlslang) "-DSLANG_ENABLE_SLANG_GLSLANG=OFF";

postInstall = ''
mv "$out/cmake" "$dev/cmake"
'';

nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/slangc";
versionCheckProgramArg = "-v";
Expand Down