Unverified Commit 93dea009 authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

shader-slang: 2025.4 -> 2025.6.1 (#380203)

parents a466f5f1 912bc9a0

pkgs/by-name/sh/shader-slang/package.nix

+10 −16
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
  lz4,

  libxml2,

  libX11,

  spirv-headers,

  glslang,

  llvmPackages_13,

  versionCheckHook,
@@ -28,13 +27,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "shader-slang";

  version = "2025.4";

  version = "2025.6.1";



  src = fetchFromGitHub {

    owner = "shader-slang";

    repo = "slang";

    tag = "v${finalAttrs.version}";

    hash = "sha256-odZEWiE8SQrfPlRjkI6HkB+sHUhj5ySyBQCKQua7CKA=";

    hash = "sha256-yNPAJX7OxxQLXDm3s7Hx5QA9fxy1qbAMp4LKYVqxMVM=";

    fetchSubmodules = true;

  };
@@ -76,21 +75,20 @@ stdenv.mkDerivation (finalAttrs: { 
      miniz

      lz4

      libxml2

      spirv-headers

    ]

    ++ (lib.optionals stdenv.hostPlatform.isLinux [

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      libX11

    ])

    ++ (lib.optionals withLLVM [

    ]

    ++ 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

    ])

    ++ (lib.optionals withGlslang [

    ]

    ++ lib.optionals withGlslang [

      # SPIRV-tools is included in glslang.

      glslang

    ]);

    ];



  separateDebugInfo = true;
@@ -125,16 +123,12 @@ stdenv.mkDerivation (finalAttrs: { 
      "-DSLANG_ENABLE_SLANG_RHI=OFF"

      "-DSLANG_USE_SYSTEM_MINIZ=ON"

      "-DSLANG_USE_SYSTEM_LZ4=ON"

      "-DSLANG_SPIRV_HEADERS_INCLUDE_DIR=${spirv-headers}/include"

      "-DSLANG_SLANG_LLVM_FLAVOR=${if withLLVM then "USE_SYSTEM_LLVM" else "DISABLE"}"

    ]

    # Currently depends on unreleased op type `SpvOpTypeNodePayloadArrayAMDX`,

    # which will be included in next release >1.3.296

    ++ lib.optional (lib.versionAtLeast spirv-headers.version "1.3.297.0") "-DSLANG_USE_SYSTEM_SPIRV_HEADERS=ON"

    ++ (lib.optionals withGlslang [

    ++ lib.optionals withGlslang [

      "-DSLANG_USE_SYSTEM_SPIRV_TOOLS=ON"

      "-DSLANG_USE_SYSTEM_GLSLANG=ON"

    ])

    ]

    ++ lib.optional (!withGlslang) "-DSLANG_ENABLE_SLANG_GLSLANG=OFF";



  nativeInstallCheckInputs = [ versionCheckHook ];