git.iko.soy/typeable/nixpkgs
on master help sign in
foot: fix evaluation with clang stdenvs

To be able to do LTO with clang we need the LTO-capable llvm-ar from libllvm.out (== llvmPackages.llvm) which contains a superset of the llvm bintools. This used to be passed through from stdenv.cc.cc as llvm, but has been renamed to libllvm in 7869d1654517c028aa76fc1dedc9b5ac301a867a. llvm-ar would be in stdenv.cc.bintools.bintools provided that we are using a clang stdenv which uses lld as its linker. In the future we could thus make this inclusion conditional on stdenv.hostPlatform.linker. Note that the build of foot.tests still fails, pending resolution of #123361.

commit631cbc3de7aaf244d322111ada656e0bedf55bff authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> dateMon 17 May 2021, 15:06 (5 years ago) parentea0c94f
1 file changed+3−1
pkgs/applications/terminal-emulators/foot/default.nix+3−1
pkgs/applications/terminal-emulators/foot/default.nix+3−1
@@ -104,7 +104,9 @@ stdenv.mkDerivation rec {
104104 tllist
105105 wayland-protocols
106106 pkg-config
107− ] ++ lib.optional stdenv.cc.isClang stdenv.cc.cc.llvm;
107+ ] ++ lib.optionals (compilerName == "clang") [
108+ stdenv.cc.cc.libllvm.out
109+ ];
108110
109111 buildInputs = [
110112 fontconfig