From 5e3cff9cb540fa808246d72f3e4faf2f9b884821 Mon Sep 17 00:00:00 2001 From: blenderfreaky Date: Tue, 12 Aug 2025 01:42:06 +0200 Subject: [PATCH] spirv-llvm-translator: pass BASE_LLVM_VERSION for LLVM 20 and 21 --- pkgs/by-name/sp/spirv-llvm-translator/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix index 6626acc70df9..7fab99fbb4b6 100644 --- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix +++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix @@ -102,7 +102,9 @@ stdenv.mkDerivation { "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}" ] - ++ lib.optional (llvmMajor == "19") "-DBASE_LLVM_VERSION=${lib.versions.majorMinor llvm.version}.0"; + ++ lib.optional ( + lib.toInt llvmMajor >= 19 + ) "-DBASE_LLVM_VERSION=${lib.versions.majorMinor llvm.version}.0"; # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist doCheck = false;