diff options
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/llvm/12/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/13/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/14/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/15/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/16/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/17/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/18/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/git/default.nix | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 0d9202df8aeeb..45955dc5e1b36 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -56,7 +56,7 @@ let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -74,7 +74,7 @@ let ./clang/gnu-install-dirs.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit clang-tools-extra_src llvm_meta; diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index ecdbd14e98e74..018fb0c638505 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -82,7 +82,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -105,7 +105,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index fb1b8743b6ebb..588dc8fffefdd 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -78,7 +78,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -96,7 +96,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index ce8426857ebe7..bfcbe2b86e247 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -84,7 +84,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -102,7 +102,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 5716267426b24..5dd07d77cf8c6 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -85,7 +85,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -103,7 +103,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix index 2f60666536f37..9f4be2261b0cf 100644 --- a/pkgs/development/compilers/llvm/17/default.nix +++ b/pkgs/development/compilers/llvm/17/default.nix @@ -80,7 +80,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -98,7 +98,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/18/default.nix b/pkgs/development/compilers/llvm/18/default.nix index 0a30288755e6f..4d2b160a23ff1 100644 --- a/pkgs/development/compilers/llvm/18/default.nix +++ b/pkgs/development/compilers/llvm/18/default.nix @@ -80,7 +80,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -98,7 +98,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 56fae64d59d8d..1a34130679db2 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -85,7 +85,7 @@ in let then tools.bintools else bootBintools; - in rec { + in { libllvm = callPackage ./llvm { inherit llvm_meta; @@ -103,7 +103,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; |