public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove libintl hacks

Browse Source
This commit is contained in:
Matthew Bauer
2018-03-14 14:15:06 -05:00
parent 9e75fb5eb4
commit ed2a9cf65f
56 changed files with 107 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/text/recode/default.nix
View File

@@ -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