commit b433e438466a96b0df08e69df1cb321c2ef20155 · pyrox.dev/nixpkgs

-83

pkgs/by-name/sh/shader-slang/1-find-packages.patch

···

       1
       1
       -
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       -
       index 549e465ac..546c94607 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -175,6 +175,8 @@ advanced_option(

     

       6
       6
       -
            "Build using system unordered dense"

     

       7
       7
       -
            OFF

     

       8
       8
       -
        )

     

       9
       9
       -
       +advanced_option(SLANG_USE_SYSTEM_SPIRV_TOOLS "Build using system SPIR-V tools library" OFF)

     

       10
       10
       -
       +advanced_option(SLANG_USE_SYSTEM_GLSLANG "Build using system glslang library" OFF)

     

       11
       11
       -
        

     

       12
       12
       -
        option(

     

       13
       13
       -
            SLANG_SPIRV_HEADERS_INCLUDE_DIR

     

       14
       14
       -
       @@ -404,6 +406,34 @@ if(${SLANG_USE_SYSTEM_UNORDERED_DENSE})

     

       15
       15
       -
            find_package(unordered_dense CONFIG QUIET)

     

       16
       16
       -
        endif()

     

       17
       17
       -
        

     

       18
       18
       -
       +if(${SLANG_USE_SYSTEM_MINIZ})

     

       19
       19
       -
       +    find_package(miniz REQUIRED)

     

       20
       20
       -
       +    add_library(miniz ALIAS miniz::miniz)

     

       21
       21
       -
       +endif()

     

       22
       22
       -
       +

     

       23
       23
       -
       +if(${SLANG_USE_SYSTEM_LZ4})

     

       24
       24
       -
       +    find_package(lz4 REQUIRED)

     

       25
       25
       -
       +    add_library(lz4_static ALIAS LZ4::lz4)

     

       26
       26
       -
       +endif()

     

       27
       27
       -
       +

     

       28
       28
       -
       +if(${SLANG_USE_SYSTEM_VULKAN_HEADERS})

     

       29
       29
       -
       +    find_package(VulkanHeaders REQUIRED)

     

       30
       30
       -
       +endif()

     

       31
       31
       -
       +

     

       32
       32
       -
       +if(${SLANG_USE_SYSTEM_SPIRV_HEADERS})

     

       33
       33
       -
       +    find_package(SPIRV-Headers REQUIRED)

     

       34
       34
       -
       +    add_library(SPIRV-Headers ALIAS SPIRV-Headers::SPIRV-Headers)

     

       35
       35
       -
       +endif()

     

       36
       36
       -
       +

     

       37
       37
       -
       +if(${SLANG_USE_SYSTEM_SPIRV_TOOLS})

     

       38
       38
       -
       +    find_package(SPIRV-Tools REQUIRED)

     

       39
       39
       -
       +endif()

     

       40
       40
       -
       +

     

       41
       41
       -
       +if(${SLANG_USE_SYSTEM_GLSLANG})

     

       42
       42
       -
       +    find_package(glslang REQUIRED)

     

       43
       43
       -
       +    add_library(glslang ALIAS glslang::glslang)

     

       44
       44
       -
       +endif()

     

       45
       45
       -
       +

     

       46
       46
       -
        add_subdirectory(external)

     

       47
       47
       -
        

     

       48
       48
       -
        # webgpu_dawn is only available as a fetched shared library, since Dawn's nested source

     

       49
       49
       -
       diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt

     

       50
       50
       -
       index 801cae4d6..d45150118 100644

     

       51
       51
       -
       --- a/external/CMakeLists.txt

     

       52
       52
       -
       +++ b/external/CMakeLists.txt

     

       53
       53
       -
       @@ -133,6 +133,7 @@ if(SLANG_ENABLE_SLANG_GLSLANG)

     

       54
       54
       -
                )

     

       55
       55
       -
            endif()

     

       56
       56
       -
        

     

       57
       57
       -
       +if(NOT ${SLANG_USE_SYSTEM_SPIRV_TOOLS})

     

       58
       58
       -
            # SPIRV-Tools

     

       59
       59
       -
            set(SPIRV_TOOLS_BUILD_STATIC ON)

     

       60
       60
       -
            set(SPIRV_WERROR OFF)

     

       61
       61
       -
       @@ -148,11 +149,14 @@ if(SLANG_ENABLE_SLANG_GLSLANG)

     

       62
       62
       -
                    ${system}

     

       63
       63
       -
                )

     

       64
       64
       -
            endif()

     

       65
       65
       -
       +endif()

     

       66
       66
       -
        

     

       67
       67
       -
       +if(NOT ${SLANG_USE_SYSTEM_GLSLANG})

     

       68
       68
       -
            # glslang

     

       69
       69
       -
            set(SKIP_GLSLANG_INSTALL ON)

     

       70
       70
       -
            set(ENABLE_OPT ON)

     

       71
       71
       -
            set(ENABLE_PCH OFF)

     

       72
       72
       -
       +    set(ALLOW_EXTERNAL_SPIRV_TOOLS ${SLANG_USE_SYSTEM_SPIRV_TOOLS})

     

       73
       73
       -
            if(NOT SLANG_OVERRIDE_GLSLANG_PATH)

     

       74
       74
       -
                add_subdirectory(glslang EXCLUDE_FROM_ALL ${system})

     

       75
       75
       -
            else()

     

       76
       76
       -
       @@ -164,6 +168,7 @@ if(SLANG_ENABLE_SLANG_GLSLANG)

     

       77
       77
       -
                )

     

       78
       78
       -
            endif()

     

       79
       79
       -
        endif()

     

       80
       80
       -
       +endif()

     

       81
       81
       -
        

     

       82
       82
       -
        # imgui

     

       83
       83
       -
        add_library(imgui INTERFACE)

pkgs/by-name/sh/shader-slang/2-shared-llvm.patch pkgs/by-name/sh/shader-slang/1-shared-llvm.patch

pkgs/by-name/sh/shader-slang/3-glslang-15.patch pkgs/by-name/sh/shader-slang/2-glslang-15.patch

+17 -24

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

···

       10
       10
        
         libxml2,

     

       11
       11
        
         libX11,

     

       12
       12
        
         glslang,

     

       13
       13
       -
         llvmPackages_13,

     

       13
       13
       +
         llvmPackages_14,

     

       14
       14
        
         versionCheckHook,

     

       15
       15
        
         gitUpdater,

     

       16
       16
        
       

     
···

       27
       27
        
       

     

       28
       28
        
       stdenv.mkDerivation (finalAttrs: {

     

       29
       29
        
         pname = "shader-slang";

     

       30
       30
       -
         version = "2025.14.3";

     

       30
       30
       +
         version = "2025.15";

     

       31
       31
        
       

     

       32
       32
        
         src = fetchFromGitHub {

     

       33
       33
        
           owner = "shader-slang";

     

       34
       34
        
           repo = "slang";

     

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

     

       36
       36
       -
           hash = "sha256-tHLm0XmS5vV+o3VmFHWG8wZnrb0p63Nz1zVyvc/e5+s=";

     

       36
       36
       +
           hash = "sha256-m1Xn8OybEDJYrR5c5eJZNvDhXtnydQ5lx1v2PqyJu5c=";

     

       37
       37
        
           fetchSubmodules = true;

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
       -
         patches = [

     

       41
       41
       -
           # Slang's build definitions do not support using system provided cmake packages

     

       42
       42
       -
           # for its dependencies.

     

       43
       43
       -
           # While it does come with "SLANG_USE_SYSTEM_XYZ" flags, these expect Slang to be

     

       44
       44
       -
           # imported into some other CMake build that already provides the necessary target.

     

       45
       45
       -
           # This patch adds the required `find_package` calls and sets up target aliases where needed.

     

       46
       46
       -
           ./1-find-packages.patch

     

       47
       47
       -
         ]

     

       48
       48
       -
         ++ lib.optionals withSharedLLVM [

     

       49
       49
       -
           # Upstream statically links libllvm and libclang++, resulting in a ~5x increase in binary size.

     

       50
       50
       -
           ./2-shared-llvm.patch

     

       51
       51
       -
         ]

     

       52
       52
       -
         ++ lib.optionals withGlslang [

     

       53
       53
       -
           # Upstream depends on glslang 13 and there are minor breaking changes in glslang 15, the version

     

       54
       54
       -
           # we ship in nixpkgs.

     

       55
       55
       -
           ./3-glslang-15.patch

     

       56
       56
       -
         ];

     

       40
       40
       +
         patches =

     

       41
       41
       +
           lib.optionals withSharedLLVM [

     

       42
       42
       +
             # Upstream statically links libllvm and libclang++, resulting in a ~5x increase in binary size.

     

       43
       43
       +
             ./1-shared-llvm.patch

     

       44
       44
       +
           ]

     

       45
       45
       +
           ++ lib.optionals withGlslang [

     

       46
       46
       +
             # Upstream depends on glslang 13 and there are minor breaking changes in glslang 15, the version

     

       47
       47
       +
             # we ship in nixpkgs.

     

       48
       48
       +
             ./2-glslang-15.patch

     

       49
       49
       +
           ];

     

       57
       50
        
       

     

       58
       51
        
         outputs = [

     

       59
       52
        
           "out"

     
···

       78
       71
        
           libX11

     

       79
       72
        
         ]

     

       80
       73
        
         ++ lib.optionals withLLVM [

     

       81
       81
       -
           # Slang only supports LLVM 13:

     

       82
       82
       -
           # https://github.com/shader-slang/slang/blob/master/docs/building.md#llvm-support

     

       83
       83
       -
           llvmPackages_13.llvm

     

       84
       84
       -
           llvmPackages_13.libclang

     

       74
       74
       +
           # Slang only supports LLVM 14:

     

       75
       75
       +
           # https://github.com/shader-slang/slang/blob/v2025.15/docs/building.md#llvm-support

     

       76
       76
       +
           llvmPackages_14.llvm

     

       77
       77
       +
           llvmPackages_14.libclang

     

       85
       78
        
         ]

     

       86
       79
        
         ++ lib.optionals withGlslang [

     

       87
       80
        
           # SPIRV-tools is included in glslang.