From f7b49ea2af1342ea3ff0d32e9048c17ac122bceb Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 13 May 2021 18:57:03 +0200 Subject: [PATCH] llvmPackages_12.lld: make sure llvm libunwind is passed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit lld needs LLVM's libunwind for its headers. That libunwind is not part of the tools scope in pkgs/development/compilers/llvm/12/default.nix, which means that lld previously received libunwind from top-level pkgs which of course doesn't have the required headers. To resolve this pass libunwind from the libraries scope — platform concerns don't really mattern as only libunwind.src is used. libunwind was initially passed correctly, but that was removed in e830db4320ac3b38c648d492b3d04c71a0860a54. This regression was likely introduced accidentally. --- pkgs/development/compilers/llvm/12/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index db43c5bd00bd..4b71a458eb73 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -96,6 +96,7 @@ let lld = callPackage ./lld { inherit llvm_meta; + inherit (libraries) libunwind; }; lldb = callPackage ./lldb {