From eddc0a554900b5868de73971c415bcb0e9c52aec Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 25 Aug 2016 08:44:20 +0000
Subject: [PATCH] treewide: fix darwin builds by using getOutput

This fixes eval for pkgs referring to optional static output
---
 pkgs/applications/science/logic/boolector/default.nix | 5 ++++-
 pkgs/development/tools/misc/prelink/default.nix       | 4 +++-
 pkgs/os-specific/linux/sinit/default.nix              | 2 +-
 pkgs/tools/backup/partclone/default.nix               | 5 ++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix
index dec7989ae541..37d25c9e9477 100644
--- a/pkgs/applications/science/logic/boolector/default.nix
+++ b/pkgs/applications/science/logic/boolector/default.nix
@@ -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 = ''
diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix
index 28b3aba8e5e4..f2c5208d7ae8 100644
--- a/pkgs/development/tools/misc/prelink/default.nix
+++ b/pkgs/development/tools/misc/prelink/default.nix
@@ -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";
diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix
index 69ffbd61760f..bf8367fcd45c 100644
--- a/pkgs/os-specific/linux/sinit/default.nix
+++ b/pkgs/os-specific/linux/sinit/default.nix
@@ -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 {
diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix
index 87c7d61d8366..54756a29cd6d 100644
--- a/pkgs/tools/backup/partclone/default.nix
+++ b/pkgs/tools/backup/partclone/default.nix
@@ -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;