From a34479850ec5bf2277b78478914c390e27e18b35 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 14 Mar 2018 21:03:00 -0700 Subject: [PATCH 1/2] fix whois build --- pkgs/tools/networking/whois/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 6f37e88f4f6..2b77184f3c9 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { for i in Makefile po/Makefile; do substituteInPlace $i --replace "prefix = /usr" "prefix = $out" done - - substituteInPlace Makefile --replace "DEFS += HAVE_ICONV" "DEFS += HAVE_ICONV\nwhois_LDADD += -liconv" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + echo "whois_LDADD += -liconv" >> Makefile ''; makeFlags = [ "HAVE_ICONV=1" ]; @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = https://packages.qa.debian.org/w/whois.html; license = licenses.gpl2; maintainers = with maintainers; [ fpletz ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From ea1377419c9e3fa4a1fc853d5a1a01a6a1149539 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Thu, 15 Mar 2018 09:30:11 -0700 Subject: [PATCH 2/2] review comment --- pkgs/tools/networking/whois/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 2b77184f3c9..48a3d1591fc 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { for i in Makefile po/Makefile; do substituteInPlace $i --replace "prefix = /usr" "prefix = $out" done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + stdenv.lib.optionalString (stdenv.isDarwin || stdenv.hostPlatform.isMusl) '' echo "whois_LDADD += -liconv" >> Makefile '';