treewide: fix darwin builds by using getOutput
This fixes eval for pkgs referring to optional static output
This commit is contained in:
parent
113fbe910e
commit
eddc0a5549
|
@ -23,7 +23,10 @@ let
|
|||
license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3;
|
||||
in
|
||||
stdenv.mkDerivation (boolectorPkg // {
|
||||
buildInputs = [ zlib stdenv.cc.libc.static zlib.static ];
|
||||
buildInputs = [
|
||||
zlib zlib.static (stdenv.lib.getOutput "static" stdenv.cc.libc)
|
||||
];
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -6,7 +6,9 @@ in
|
|||
stdenv.mkDerivation rec {
|
||||
name = "prelink-${version}";
|
||||
|
||||
buildInputs = [ libelf stdenv.cc.libc stdenv.cc.libc.static ];
|
||||
buildInputs = [
|
||||
libelf stdenv.cc.libc (stdenv.lib.getOutput "static" stdenv.cc.libc)
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2";
|
||||
|
|
|
@ -10,7 +10,7 @@ let
|
|||
rev = "refs/tags/v${version}";
|
||||
};
|
||||
buildInputs = [
|
||||
stdenv.cc.libc.static
|
||||
(stdenv.lib.getOutput "static" stdenv.cc.libc)
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ e2fsprogs libuuid stdenv.cc.libc stdenv.cc.libc.static ];
|
||||
buildInputs = [
|
||||
e2fsprogs libuuid stdenv.cc.libc
|
||||
(stdenv.lib.getOutput "static" stdenv.cc.libc)
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
Loading…
Reference in a new issue