diff options
author | Randy Eckenrode <randy@largeandhighquality.com> | 2024-04-21 20:44:23 -0400 |
---|---|---|
committer | Randy Eckenrode <randy@largeandhighquality.com> | 2024-04-21 20:52:37 -0400 |
commit | 99df680e03194c035885675a6ccd71a94e18a231 (patch) | |
tree | 1f6799f9a8da7a1109ed8e0580750bf05056d04e /pkgs/development/compilers/llvm/17/default.nix | |
parent | 671845329428f122d02f6253e63ecb57976103c0 (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/17/default.nix')
-rw-r--r-- | pkgs/development/compilers/llvm/17/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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; |