From 82b74ae42547a5ade39f64f102ab2be941cfa9a8 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Fri, 15 May 2015 21:21:52 -0700 Subject: [PATCH] Conditionally link libnatspec with darwin.libiconv This fixes zip-archive, which depended on darwin.libiconv via GHC and regular libiconv via libnatspec. --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24c28c46f35..df9de2bc0ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6699,7 +6699,11 @@ let libmsgpack = callPackage ../development/libraries/libmsgpack { }; 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 { };