From 276b313a2b80f47e5c665717f0ac47e2457d5b24 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 23 Feb 2024 05:47:53 +0100
Subject: [PATCH] llvmPackages_git.mlir: init

---
 pkgs/development/compilers/llvm/17/default.nix                | 2 +-
 .../compilers/llvm/{17 => common}/mlir/default.nix            | 0
 .../compilers/llvm/{17 => common}/mlir/gnu-install-dirs.patch | 0
 pkgs/development/compilers/llvm/git/default.nix               | 4 ++++
 4 files changed, 5 insertions(+), 1 deletion(-)
 rename pkgs/development/compilers/llvm/{17 => common}/mlir/default.nix (100%)
 rename pkgs/development/compilers/llvm/{17 => common}/mlir/gnu-install-dirs.patch (100%)

diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix
index 67076da64941..60cae920945b 100644
--- a/pkgs/development/compilers/llvm/17/default.nix
+++ b/pkgs/development/compilers/llvm/17/default.nix
@@ -144,7 +144,7 @@ in let
       inherit llvm_meta;
     };
 
-    mlir = callPackage ./mlir {
+    mlir = callPackage ../common/mlir {
       inherit llvm_meta;
     };
 
diff --git a/pkgs/development/compilers/llvm/17/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/17/mlir/default.nix
rename to pkgs/development/compilers/llvm/common/mlir/default.nix
diff --git a/pkgs/development/compilers/llvm/17/mlir/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/common/mlir/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/17/mlir/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/common/mlir/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix
index 5b540c1bd12a..1efaa0402fc7 100644
--- a/pkgs/development/compilers/llvm/git/default.nix
+++ b/pkgs/development/compilers/llvm/git/default.nix
@@ -144,6 +144,10 @@ in let
       inherit llvm_meta;
     };
 
+    mlir = callPackage ../common/mlir {
+      inherit llvm_meta;
+    };
+
     lldb = callPackage ../common/lldb.nix {
       src = callPackage ({ runCommand }: runCommand "lldb-src-${version}" {} ''
         mkdir -p "$out"