From 4b58636c0d798506342917591a6ba90eb080f1c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 10 Mar 2015 18:08:01 +0100 Subject: [PATCH] Revert "gettext: fix build on darwin" This reverts commit fc15721871776672488c8b2e85424e4ddcf56cd4. I trusted the referred comment (and maybe misunderstood it), but the commit wasn't a good idea at all. --- pkgs/development/libraries/gettext/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index c35f8f3521e2..81918b7c5e34 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv, libintlOrEmpty, xz }: +{ stdenv, fetchurl, libiconv, xz }: stdenv.mkDerivation (rec { name = "gettext-0.18.2"; @@ -30,8 +30,7 @@ stdenv.mkDerivation (rec { fi ''; - buildInputs = [ xz ] - ++ libintlOrEmpty ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; enableParallelBuilding = true;