public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conditionally link libnatspec with darwin.libiconv

Browse Source 
This fixes zip-archive, which depended on darwin.libiconv via GHC and regular libiconv via
libnatspec.
This commit is contained in:
Joel Taylor 2015-05-15 21:21:52 -07:00
parent 484a7be844
commit 82b74ae425
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -6699,7 +6699,11 @@ let
libmsgpack = callPackage ../development/libraries/libmsgpack { }; libmsgpack = callPackage ../development/libraries/libmsgpack { };
libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { };
libnatspec = callPackage ../development/libraries/libnatspec { }; libnatspec = callPackage ../development/libraries/libnatspec (
stdenv.lib.optionalAttrs stdenv.isDarwin {
inherit (darwin) libiconv;
}
);
libndp = callPackage ../development/libraries/libndp { }; libndp = callPackage ../development/libraries/libndp { };