From 3d9f74651d01b73e9c46d89bf17d5103e48ab307 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 30 Mar 2025 21:38:45 -0700
Subject: [PATCH] llvmPackages_{12,13,14,15,16,17,18,19,20,git}.libclc: move
 into libclc directory

---
 pkgs/development/compilers/llvm/common/default.nix              | 2 +-
 .../compilers/llvm/common/{libclc.nix => libclc/default.nix}    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/compilers/llvm/common/{libclc.nix => libclc/default.nix} (98%)

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 225abc626e42..a61ad6b085ba 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -468,7 +468,7 @@ let
     }
     // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "16") {
       mlir = callPackage ./mlir { };
-      libclc = callPackage ./libclc.nix { };
+      libclc = callPackage ./libclc { };
     }
     // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") {
       bolt = callPackage ./bolt {
diff --git a/pkgs/development/compilers/llvm/common/libclc.nix b/pkgs/development/compilers/llvm/common/libclc/default.nix
similarity index 98%
rename from pkgs/development/compilers/llvm/common/libclc.nix
rename to pkgs/development/compilers/llvm/common/libclc/default.nix
index 73fe3b728a72..290f7487c797 100644
--- a/pkgs/development/compilers/llvm/common/libclc.nix
+++ b/pkgs/development/compilers/llvm/common/libclc/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches =
-    [ ./libclc/libclc-gnu-install-dirs.patch ]
+    [ ./libclc-gnu-install-dirs.patch ]
     # LLVM 19 changes how host tools are looked up.
     # Need to remove NO_DEFAULT_PATH and the PATHS arguments for find_program
     # so CMake can actually find the tools in nativeBuildInputs.