about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2024-02-24 04:48:21 +0100
committerGitHub <noreply@github.com>2024-02-24 04:48:21 +0100
commita426b50dc668ff5e32fe4bd862223f4094885c3e (patch)
treeb0a6c93f4c1aeeaae91ea5243e7680489e0435db /pkgs/development/compilers
parented2668f7d8b6a54f2a25e7ec52bfed4d4968af5d (diff)
parent276b313a2b80f47e5c665717f0ac47e2457d5b24 (diff)
Merge pull request #290767 from wegank/mlir-git
llvmPackages_git.mlir: init
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/llvm/17/default.nix2
-rw-r--r--pkgs/development/compilers/llvm/common/mlir/default.nix (renamed from pkgs/development/compilers/llvm/17/mlir/default.nix)0
-rw-r--r--pkgs/development/compilers/llvm/common/mlir/gnu-install-dirs.patch (renamed from pkgs/development/compilers/llvm/17/mlir/gnu-install-dirs.patch)0
-rw-r--r--pkgs/development/compilers/llvm/git/default.nix4
4 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix
index 67076da64941b..60cae920945b7 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
index 8e99fa0fe337f..8e99fa0fe337f 100644
--- a/pkgs/development/compilers/llvm/17/mlir/default.nix
+++ b/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
index 95191022d1a38..95191022d1a38 100644
--- a/pkgs/development/compilers/llvm/17/mlir/gnu-install-dirs.patch
+++ b/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 5b540c1bd12a4..1efaa0402fc71 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"