mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
recode: fix build after stdenv merge + #354
ToDo: tests don't pass yet.
This commit is contained in:
parent
d5288c7e3a
commit
f0f34067e7
@ -1,6 +1,6 @@
|
||||
# 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 {
|
||||
name = "recode-3.7-pff85fdbd";
|
||||
@ -11,9 +11,19 @@ stdenv.mkDerivation rec {
|
||||
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 = ''
|
||||
checkFlagsArray=(CPPFLAGS="-I../lib" LDFLAGS="-L../src/.libs -Wl,-rpath=../src/.libs")
|
||||
|
Loading…
Reference in New Issue
Block a user