From 06839f5a40c4e25128a0a0d91dddaaa310b2e081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 17 Sep 2016 02:19:14 +0200
Subject: [PATCH] fix some evaluation problems after 8610a34474

/cc #18327.
---
 pkgs/development/compilers/gcc/6/default.nix | 2 +-
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index b6b6b32703d..acddc9081be 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -461,7 +461,7 @@ stdenv.mkDerivation ({
   #
   # Likewise, the LTO code doesn't find zlib.
 
-  CPATH = makeSearchPath "dev" "include" ([]
+  CPATH = makeSearchPathOutput "dev" "include" ([]
     ++ optional (zlib != null) zlib
     ++ optional langJava boehmgc
     ++ optionals javaAwtGtk xlibs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b82b701351c..02fd446256f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10964,7 +10964,7 @@ in
 
     stubs = callPackages ../os-specific/darwin/stubs {};
 
-    usr-include = callPackage ../os-specific/darwin/macheaders.nix {};
+    usr-include = callPackage ../os-specific/darwin/usr-include {};
   };
 
   devicemapper = lvm2;