about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Litak <elitak@gmail.com>2016-05-28 09:26:23 -0700
committerEric Litak <elitak@gmail.com>2016-05-31 09:33:32 -0700
commit78f793382980e93cbeb60fec0d68da3282c8448f (patch)
tree2068e58185b90374ad433e3b3e57d682619468bd
parentf44e70a68bd33721384b1027f30d3d8f3a085c15 (diff)
downloadnixlib-78f793382980e93cbeb60fec0d68da3282c8448f.tar
nixlib-78f793382980e93cbeb60fec0d68da3282c8448f.tar.gz
nixlib-78f793382980e93cbeb60fec0d68da3282c8448f.tar.bz2
nixlib-78f793382980e93cbeb60fec0d68da3282c8448f.tar.lz
nixlib-78f793382980e93cbeb60fec0d68da3282c8448f.tar.xz
nixlib-78f793382980e93cbeb60fec0d68da3282c8448f.tar.zst
nixlib-78f793382980e93cbeb60fec0d68da3282c8448f.zip
infinite recursion and cross-build fix
-rw-r--r--pkgs/development/libraries/gettext/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 78a8756b59b4..63eb086b0fb1 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     sed -i -e "s/\(am_libgettextlib_la_OBJECTS = \)error.lo/\\1/" gettext-tools/gnulib-lib/Makefile.in
   '';
 
-  buildInputs = [ xz xz.bin libiconv ];
+  nativeBuildInputs = [ xz xz.bin ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; # HACK, see #10874 (and 14664)
 
   enableParallelBuilding = true;