diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-17 02:19:14 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-17 02:26:49 +0200 |
| commit | 06839f5a40c4e25128a0a0d91dddaaa310b2e081 (patch) | |
| tree | fd99e8fd27834222308662dbe48394b314c95732 | |
| parent | 67074366384f681949b551ce8590907740090e45 (diff) | |
| download | nixpkgs-06839f5a40c4e25128a0a0d91dddaaa310b2e081.tar nixpkgs-06839f5a40c4e25128a0a0d91dddaaa310b2e081.tar.gz nixpkgs-06839f5a40c4e25128a0a0d91dddaaa310b2e081.tar.bz2 nixpkgs-06839f5a40c4e25128a0a0d91dddaaa310b2e081.tar.lz nixpkgs-06839f5a40c4e25128a0a0d91dddaaa310b2e081.tar.xz nixpkgs-06839f5a40c4e25128a0a0d91dddaaa310b2e081.tar.zst nixpkgs-06839f5a40c4e25128a0a0d91dddaaa310b2e081.zip | |
fix some evaluation problems after 8610a34474
/cc #18327.
| -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 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; |