diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-09 11:31:16 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-09 11:32:22 +0100 |
| commit | f0f34067e72991c110f3cc023e5673f38ba1e48e (patch) | |
| tree | 860a3911ee9112195f0ba32ce8e149f765e8ae02 /pkgs/tools/text/recode | |
| parent | d5288c7e3a1e39bbaaac9dee54c6c6afe4060fe6 (diff) | |
recode: fix build after stdenv merge + #354
ToDo: tests don't pass yet.
Diffstat (limited to 'pkgs/tools/text/recode')
| -rw-r--r-- | pkgs/tools/text/recode/default.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index e3a58bbb5a83..db9ed5d30f30 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -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") |