diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
index 7e5f850aa4d8..f6e7a42116d8 100644
--- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix
+++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
@@ -38,7 +38,12 @@ let
     };
   };
 
-  branch = versions."${llvmMajor}" or (throw "Incompatible LLVM version ${llvmMajor}");
+  branch =
+    versions."${llvmMajor}" or {
+      version = "${llvmMajor}.x.x";
+      rev = "";
+      hash = "";
+    };
 in
 stdenv.mkDerivation {
   pname = "SPIRV-LLVM-Translator";
@@ -107,5 +112,6 @@ stdenv.mkDerivation {
     license = licenses.ncsa;
     platforms = platforms.unix;
     maintainers = with maintainers; [ gloaming ];
+    broken = !(versions ? ${llvmMajor});
   };
 }
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index e86e5701a35c..e8c7f768267b 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -393,14 +393,13 @@ let
       clangNoLibcxx = tools.clangWithLibcAndBasicRt;
 
       mlir = callPackage ./mlir { };
+
+      libclc = callPackage ./libclc { };
     }
     // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") {
       bolt = callPackage ./bolt {
       };
     }
-    // lib.optionalAttrs (lib.versionOlder metadata.release_version "22") {
-      libclc = callPackage ./libclc { };
-    }
     // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {
       flang = callPackage ./flang {
         mlir = tools.mlir;