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

recode: fix build after stdenv merge + #354 

ToDo: tests don't pass yet.
This commit is contained in:
Vladimír Čunát 2013-03-09 11:31:16 +01:00
parent d5288c7e3a
commit f0f34067e7
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
# XXX: this may need -liconv on non-glibc systems.. # XXX: this may need -liconv on non-glibc systems..
{stdenv, fetchgit, python, perl}: { stdenv, fetchgit, python, perl, autoconf, automake, libtool, intltool, flex }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "recode-3.7-pff85fdbd"; name = "recode-3.7-pff85fdbd";
@ -11,9 +11,19 @@ stdenv.mkDerivation rec {
sha256 = "1xhlfmqld6af16l444jli9crj9brym2jihg1n6lkxh2gar68f5l7"; sha256 = "1xhlfmqld6af16l444jli9crj9brym2jihg1n6lkxh2gar68f5l7";
}; };
buildInputs = [ python perl ]; buildInputs = [ python perl autoconf automake libtool intltool flex ];
doCheck = true; preConfigure = ''
# fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455
#rm acinclude.m4
substituteInPlace Makefile.am --replace "ACLOCAL = ./aclocal.sh @ACLOCAL@" ""
sed -i '/^AM_C_PROTOTYPES/d' configure.ac
substituteInPlace src/Makefile.am --replace "ansi2knr" ""
autoreconf -fi
'';
#doCheck = true; # doesn't work yet
preCheck = '' preCheck = ''
checkFlagsArray=(CPPFLAGS="-I../lib" LDFLAGS="-L../src/.libs -Wl,-rpath=../src/.libs") checkFlagsArray=(CPPFLAGS="-I../lib" LDFLAGS="-L../src/.libs -Wl,-rpath=../src/.libs")