From f623858a82ed237ec79398f9c9db16302954addf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 23 Mar 2018 22:49:02 -0500 Subject: [PATCH 1/3] glib: no one wants --witih-libiconv=gnu Previously this was set on FreBSD and SunOS... --- pkgs/development/libraries/glib/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 1f71baaeb5d..d2dc9a8c637 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -73,9 +73,6 @@ stdenv.mkDerivation rec { # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] ++ 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" # Can't run this test when cross-compiling ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) From 9204fa2620affbe10e57ffaddbb6d658f211c2cb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 23 Mar 2018 21:57:16 -0500 Subject: [PATCH 2/3] propagate libiconv header from musl too --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91e81361f69..b301a8a4ff7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9977,7 +9977,7 @@ with pkgs; # We also provide `libiconvReal`, which will always be a standalone libiconv, # just in case you want it regardless of platform. libiconv = - if hostPlatform.libc == "glibc" + if (hostPlatform.libc == "glibc" || hostPlatform.libc == "musl") then glibcIconv (if hostPlatform != buildPlatform then libcCross else stdenv.cc.libc) From b6b94f0b272da06419d64d5a1a0991bb23e5b17f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 11:54:28 -0500 Subject: [PATCH 3/3] man-db: disable tests w/musl as simplest solution --- pkgs/tools/misc/man-db/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index eadb736aeeb..8d0728b7556 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.hostPlatform.isMusl; /* iconv binary */ meta = with stdenv.lib; { homepage = http://man-db.nongnu.org;