mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
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 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:
parent
ea0c94f50d
commit
631cbc3de7
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user