public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: fix darwin builds by using getOutput

Browse Source 
This fixes eval for pkgs referring to optional static output
This commit is contained in:
Robin Gloster 2016-08-25 08:44:20 +00:00
parent 113fbe910e
commit eddc0a5549
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/science/logic/boolector/default.nix
View File

@ -23,7 +23,10 @@ let
license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3; license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3;
in in
stdenv.mkDerivation (boolectorPkg // { stdenv.mkDerivation (boolectorPkg // {
buildInputs = [ zlib stdenv.cc.libc.static zlib.static ]; buildInputs = [
zlib zlib.static (stdenv.lib.getOutput "static" stdenv.cc.libc)
];
enableParallelBuilding = false; enableParallelBuilding = false;
installPhase = '' installPhase = ''

4
pkgs/development/tools/misc/prelink/default.nix
View File

@ -6,7 +6,9 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "prelink-${version}"; 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 { src = fetchurl {
url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2"; url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2";

2
pkgs/os-specific/linux/sinit/default.nix
View File

@ -10,7 +10,7 @@ let
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
}; };
buildInputs = [ buildInputs = [
stdenv.cc.libc.static (stdenv.lib.getOutput "static" stdenv.cc.libc)
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {

5
pkgs/tools/backup/partclone/default.nix
View File

@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; 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; enableParallelBuilding = true;