alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

fix some evaluation problems after 8610a34474

Browse source 
/cc #18327.
This commit is contained in:
Vladimír Čunát 2016-09-17 02:19:14 +02:00
parent 6707436638
commit 06839f5a40
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/compilers/gcc/6/default.nix
View file

@ -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

2
pkgs/top-level/all-packages.nix
View file

@ -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;