Skip to content

shader-slang: 2025.14.3 -> 2025.15 #437524

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
Aug 27, 2025
Merged

shader-slang: 2025.14.3 -> 2025.15 #437524

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
83 changes: 0 additions & 83 deletions pkgs/by-name/sh/shader-slang/1-find-packages.patch
View file
Open in desktop

This file was deleted.

0 ...-name/sh/shader-slang/2-shared-llvm.patch → ...-name/sh/shader-slang/1-shared-llvm.patch
View file
Open in desktop
File renamed without changes.
0 ...y-name/sh/shader-slang/3-glslang-15.patch → ...y-name/sh/shader-slang/2-glslang-15.patch
View file
Open in desktop
File renamed without changes.
41 changes: 17 additions & 24 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 @@ -10,7 +10,7 @@
libxml2,
libX11,
glslang,
llvmPackages_13,
llvmPackages_14,
versionCheckHook,
gitUpdater,

Expand All @@ -27,33 +27,26 @@

stdenv.mkDerivation (finalAttrs: {
pname = "shader-slang";
version = "2025.14.3";
version = "2025.15";

src = fetchFromGitHub {
owner = "shader-slang";
repo = "slang";
tag = "v${finalAttrs.version}";
hash = "sha256-tHLm0XmS5vV+o3VmFHWG8wZnrb0p63Nz1zVyvc/e5+s=";
hash = "sha256-m1Xn8OybEDJYrR5c5eJZNvDhXtnydQ5lx1v2PqyJu5c=";
fetchSubmodules = true;
};

patches = [
# Slang's build definitions do not support using system provided cmake packages
# for its dependencies.
# While it does come with "SLANG_USE_SYSTEM_XYZ" flags, these expect Slang to be
# imported into some other CMake build that already provides the necessary target.
# This patch adds the required `find_package` calls and sets up target aliases where needed.
./1-find-packages.patch
]
++ lib.optionals withSharedLLVM [
# Upstream statically links libllvm and libclang++, resulting in a ~5x increase in binary size.
./2-shared-llvm.patch
]
++ lib.optionals withGlslang [
# Upstream depends on glslang 13 and there are minor breaking changes in glslang 15, the version
# we ship in nixpkgs.
./3-glslang-15.patch
];
patches =
lib.optionals withSharedLLVM [
# Upstream statically links libllvm and libclang++, resulting in a ~5x increase in binary size.
./1-shared-llvm.patch
]
++ lib.optionals withGlslang [
# Upstream depends on glslang 13 and there are minor breaking changes in glslang 15, the version
# we ship in nixpkgs.
./2-glslang-15.patch
];

outputs = [
"out"
Expand All @@ -78,10 +71,10 @@ stdenv.mkDerivation (finalAttrs: {
libX11
]
++ lib.optionals withLLVM [
# Slang only supports LLVM 13:
# https://github.com/shader-slang/slang/blob/master/docs/building.md#llvm-support
llvmPackages_13.llvm
llvmPackages_13.libclang
# Slang only supports LLVM 14:
# https://github.com/shader-slang/slang/blob/v2025.15/docs/building.md#llvm-support
llvmPackages_14.llvm
llvmPackages_14.libclang
]
++ lib.optionals withGlslang [
# SPIRV-tools is included in glslang.
Expand Down
Loading