diff options
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 2 | ||||
| -rw-r--r-- | 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 b6b6b32703d4..acddc9081be0 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 b82b701351cb..02fd446256f1 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; |