From 41d894b87f08fc1521733bdb87561565baef678c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 26 Oct 2016 22:34:27 -0400 Subject: [PATCH] libiconv: Just include the iconv headers --- pkgs/top-level/all-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eab43bbdb0e3..26953af8acf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7937,10 +7937,18 @@ in (if crossSystem.libc == "glibc" then libcCross else if crossSystem.libc == "libSystem" then darwin.libiconv else libiconvReal) - else if stdenv.isGlibc then stdenv.cc.libc + else if stdenv.isGlibc then glibcIconv stdenv.cc.libc else if stdenv.isDarwin then darwin.libiconv else libiconvReal; + glibcIconv = libc: let + inherit (builtins.parseDrvName libc.name) name version; + libcDev = lib.getDev libc; + in runCommand "${name}-iconv-${version}" {} '' + mkdir -p $out/include + ln -sv ${libcDev}/include/iconv.h $out/include + ''; + libiconvReal = callPackage ../development/libraries/libiconv { fetchurl = fetchurlBoot; };