From ed2a9cf65fe2bf02bc3e7070ca4b124260d99585 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 14:15:06 -0500 Subject: treewide: remove libintl hacks --- pkgs/tools/text/recode/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'pkgs/tools/text') diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index acf657d2292c..9cc09a702102 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook, -texinfo, libiconv }: +{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook +, texinfo, libiconv, libintl }: stdenv.mkDerivation rec { name = "recode-3.7-2fd838565"; @@ -11,16 +11,13 @@ stdenv.mkDerivation rec { sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03"; }; - nativeBuildInputs = [ python perl intltool flex texinfo autoreconfHook libiconv ]; + nativeBuildInputs = [ python perl intltool flex texinfo autoreconfHook libiconv libintl ]; preAutoreconf = '' # fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455 substituteInPlace Makefile.am --replace "ACLOCAL = ./aclocal.sh @ACLOCAL@" "" sed -i '/^AM_C_PROTOTYPES/d' configure.ac substituteInPlace src/Makefile.am --replace "ansi2knr" "" - '' - + stdenv.lib.optionalString stdenv.isDarwin '' - export LDFLAGS=-lintl ''; #doCheck = true; # doesn't work yet -- cgit 1.4.1