commit 631cbc3de7aaf244d322111ada656e0bedf55bff · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

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.

sternenseemann 4 years ago 631cbc3d ea0c94f5

options

unified split

Changed files

+3 -1

pkgs

applications

terminal-emulators

foot

default.nix

+3 -1

pkgs/applications/terminal-emulators/foot/default.nix

···

       104
        
           tllist

     

       105
        
           wayland-protocols

     

       106
        
           pkg-config

     

       107
       -
         ] ++ lib.optional stdenv.cc.isClang stdenv.cc.cc.llvm;

     

       0
        
       
     

       0
        
       
     

       108
        
       

     

       109
        
         buildInputs = [

     

       110
        
           fontconfig

···

       104
        
           tllist

     

       105
        
           wayland-protocols

     

       106
        
           pkg-config

     

       107
       +
         ] ++ lib.optionals (compilerName == "clang") [

     

       108
       +
           stdenv.cc.cc.libllvm.out

     

       109
       +
         ];

     

       110
        
       

     

       111
        
         buildInputs = [

     

       112
        
           fontconfig