alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

foot: fix evaluation with clang stdenvs

Browse source 
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 7869d16545.

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.
This commit is contained in:
sternenseemann 2021-05-17 15:06:37 +02:00 committed by sterni
parent ea0c94f50d
commit 631cbc3de7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/terminal-emulators/foot/default.nix
View file

@ -104,7 +104,9 @@ stdenv.mkDerivation rec {
tllist
wayland-protocols
pkg-config
] ++ lib.optional stdenv.cc.isClang stdenv.cc.cc.llvm;
] ++ lib.optionals (compilerName == "clang") [
stdenv.cc.cc.libllvm.out
];
buildInputs = [
fontconfig