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

Merge pull request #37835 from dtzWill/fix/musl-libiconv 

"libiconv" fixes re:musl
This commit is contained in:
Will Dietz 2018-03-25 23:40:20 -05:00 committed by GitHub
parent 1eda88c3bf b6b94f0b27
commit 01b254ec50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/glib/default.nix
View File

@ -73,9 +73,6 @@ stdenv.mkDerivation rec {
# internal pcre would only add <200kB, but it's relatively common # internal pcre would only add <200kB, but it's relatively common
configureFlags = [ "--with-pcre=system" ] configureFlags = [ "--with-pcre=system" ]
++ optional stdenv.isDarwin "--disable-compile-warnings" ++ optional stdenv.isDarwin "--disable-compile-warnings"
# glibc inclues GNU libiconv, but Darwin's iconv function is good enonugh.
++ optional (stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isDarwin)
"--with-libiconv=gnu"
++ optional stdenv.isSunOS "--disable-dtrace" ++ optional stdenv.isSunOS "--disable-dtrace"
# Can't run this test when cross-compiling # Can't run this test when cross-compiling
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform)

2
pkgs/tools/misc/man-db/default.nix
View File

@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = !stdenv.hostPlatform.isMusl; /* iconv binary */
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://man-db.nongnu.org; homepage = http://man-db.nongnu.org;

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

@ -9977,7 +9977,7 @@ with pkgs;
# We also provide `libiconvReal`, which will always be a standalone libiconv, # We also provide `libiconvReal`, which will always be a standalone libiconv,
# just in case you want it regardless of platform. # just in case you want it regardless of platform.
libiconv = libiconv =
if hostPlatform.libc == "glibc" if (hostPlatform.libc == "glibc" || hostPlatform.libc == "musl")
then glibcIconv (if hostPlatform != buildPlatform then glibcIconv (if hostPlatform != buildPlatform
then libcCross then libcCross
else stdenv.cc.libc) else stdenv.cc.libc)