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

libiconv: Just include the iconv headers

Browse Source
This commit is contained in:
Shea Levy 2016-10-26 22:34:27 -04:00
parent 82cba42dc4
commit 41d894b87f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7937,10 +7937,18 @@ in
(if crossSystem.libc == "glibc" then libcCross (if crossSystem.libc == "glibc" then libcCross
else if crossSystem.libc == "libSystem" then darwin.libiconv else if crossSystem.libc == "libSystem" then darwin.libiconv
else libiconvReal) 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 if stdenv.isDarwin then darwin.libiconv
else libiconvReal; 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 { libiconvReal = callPackage ../development/libraries/libiconv {
fetchurl = fetchurlBoot; fetchurl = fetchurlBoot;
}; };