commit d014d27fd639dca83fe68080612faf14b325592c · pyrox.dev/nixpkgs

+13 -6
pkgs/development/compilers/spirv-llvm-translator/default.nix
···

       29
       29
        
             rev = "v${version}";

     

       30
       30
        
             hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI=";

     

       31
       31
        
           } else if llvmMajor == "14" then rec{

     

       32
       32
       -
             version = "14.0.0";

     

       33
       33
       -
             rev = "v${version}";

     

       34
       34
       -
             hash = "sha256-BhNAApgZ/w/92XjpoDY6ZEIhSTwgJ4D3/EfNvPmNM2o=";

     

       32
       32
       +
             version = "14.0.0+unstable-2023-06-22";

     

       33
       33
       +
             rev = "23f398bf369093b1fd67459db8071ffcc6b92658";

     

       34
       34
       +
             hash = "sha256-o7cVj5/ZMER2CvfxL4pRb2qCIxC/HFUPiitf2fKtCyk=";

     

       35
       35
        
           } else if llvmMajor == "11" then {

     

       36
       36
       -
             version = "unstable-2022-05-04";

     

       36
       36
       +
             version = "11.0.0+unstable-2022-05-04";

     

       37
       37
        
             rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0

     

       38
       38
        
             hash = "sha256-NoIoa20+2sH41rEnr8lsMhtfesrtdPINiXtUnxYVm8s=";

     

       39
       39
        
           } else throw "Incompatible LLVM version.";

     
···

       48
       48
        
           inherit (branch) rev hash;

     

       49
       49
        
         };

     

       50
       50
        
       

     

       51
       51
       -
         patches = lib.optionals (llvmMajor == "16")[

     

       51
       51
       +
         patches = lib.optionals (llvmMajor == "16") [

     

       52
       52
        
           # Fixes builds that link against external LLVM dynamic library

     

       53
       53
        
           (fetchpatch {

     

       54
       54
        
             url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/f3b9b604d7eda18d0d1029d94a6eebd33aa3a3fe.patch";

     

       55
       55
        
             hash = "sha256-opDjyZcy7O4wcSfm/A51NCIiDyIvbcmbv9ns1njdJbc=";

     

       56
       56
        
           })

     

       57
       57
       +
         ] ++ lib.optionals (llvmMajor == "14") [

     

       58
       58
       +
           (fetchpatch {

     

       59
       59
       +
             # tries to install llvm-spirv into llvm nix store path

     

       60
       60
       +
             url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/cce9a2f130070d799000cac42fe24789d2b777ab.patch";

     

       61
       61
       +
             revert = true;

     

       62
       62
       +
             hash = "sha256-GbFacttZRDCgA0jkUoFA4/B3EDn3etweKvM09OwICJ8=";

     

       63
       63
       +
           })

     

       57
       64
        
         ];

     

       58
       65
        
       

     

       59
       66
        
         nativeBuildInputs = [ pkg-config cmake ]

     
···

       71
       78
        
           "-DLLVM_SPIRV_BUILD_EXTERNAL=YES"

     

       72
       79
        
           # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/

     

       73
       80
        
           "-DCMAKE_SKIP_BUILD_RPATH=ON"

     

       74
       74
       -
         ] ++ lib.optionals (llvmMajor != "11") [ "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}" ];

     

       81
       81
       +
         ] ++ lib.optional (llvmMajor != "11") "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}";

     

       75
       82
        
       

     

       76
       83
        
         # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist

     

       77
       84
        
         doCheck = false;