about summary refs log tree commit diff
path: root/pkgs/development/compilers/llvm/git/default.nix
diff options
context:
space:
mode:
authorRandy Eckenrode <randy@largeandhighquality.com>2024-04-21 20:44:23 -0400
committerRandy Eckenrode <randy@largeandhighquality.com>2024-04-21 20:52:37 -0400
commit99df680e03194c035885675a6ccd71a94e18a231 (patch)
tree1f6799f9a8da7a1109ed8e0580750bf05056d04e /pkgs/development/compilers/llvm/git/default.nix
parent671845329428f122d02f6253e63ecb57976103c0 (diff)
llvmPackages_{12,13,14,15,16,17,18,git}: use fixpoint instead of rec
Currently, overriding llvmPackages.libllvm doesn’t work correctly. The
original version of libllvm will also be built because it is referenced
by libclang. Switching to the fixpoint allows the override to be
propagated to clang as expected. This will be needed for future Darwin
stdenv bootstrap improvements.
Diffstat (limited to 'pkgs/development/compilers/llvm/git/default.nix')
-rw-r--r--pkgs/development/compilers/llvm/git/default.nix4
1 files changed, 2 insertions, 2 deletions
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;