diff options
| author | Jack Cummings <jack@mudshark.org> | 2013-03-06 01:07:54 -0800 |
|---|---|---|
| committer | Jack Cummings <jack@mudshark.org> | 2013-03-06 01:07:54 -0800 |
| commit | ed99c87a263a2ac50e0626a48a316c506f492bc1 (patch) | |
| tree | bb888850e9b63b8d64562580838ca324bba46537 /pkgs/tools/text/recode | |
| parent | e61bdcfacd7206b6cf426257ee82fc55808f0216 (diff) | |
| download | nixlib-ed99c87a263a2ac50e0626a48a316c506f492bc1.tar nixlib-ed99c87a263a2ac50e0626a48a316c506f492bc1.tar.gz nixlib-ed99c87a263a2ac50e0626a48a316c506f492bc1.tar.bz2 nixlib-ed99c87a263a2ac50e0626a48a316c506f492bc1.tar.lz nixlib-ed99c87a263a2ac50e0626a48a316c506f492bc1.tar.xz nixlib-ed99c87a263a2ac50e0626a48a316c506f492bc1.tar.zst nixlib-ed99c87a263a2ac50e0626a48a316c506f492bc1.zip | |
get recode testsuite running.
Diffstat (limited to 'pkgs/tools/text/recode')
| -rw-r--r-- | pkgs/tools/text/recode/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/text/recode/recode-3.6-as-if.patch | 19 | ||||
| -rw-r--r-- | pkgs/tools/text/recode/recode-3.6-gettextfix.diff | 23 |
3 files changed, 11 insertions, 43 deletions
diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index f1972e085f58..17a63799ac4e 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchgit}: +# XXX: this may need -liconv on non-glibc systems.. + +{stdenv, fetchgit, python, perl}: stdenv.mkDerivation rec { name = "recode-3.7-pff85fdbd"; @@ -9,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1xhlfmqld6af16l444jli9crj9brym2jihg1n6lkxh2gar68f5l7"; }; + buildInputs = [ python perl ]; + + doCheck = true; + + preCheck = '' + checkFlagsArray=(LDFLAGS="-L../src/.libs -Wl,-rpath=../src/.libs") + ''; + meta = { homepage = "http://www.gnu.org/software/recode/"; description = "Converts files between various character sets and usages"; diff --git a/pkgs/tools/text/recode/recode-3.6-as-if.patch b/pkgs/tools/text/recode/recode-3.6-as-if.patch deleted file mode 100644 index c7bcc27c8750..000000000000 --- a/pkgs/tools/text/recode/recode-3.6-as-if.patch +++ /dev/null @@ -1,19 +0,0 @@ -http://bugs.gentoo.org/283029 - ---- a/m4/flex.m4 -+++ b/m4/flex.m4 -@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX - dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT - AC_DEFUN(ad_AC_PROG_FLEX, - [AC_CHECK_PROGS(LEX, flex, missing) --if test "$LEX" = missing; then -+AS_IF([test "$LEX" = missing], [dnl - LEX="\$(top_srcdir)/$ac_aux_dir/missing flex" - LEX_OUTPUT_ROOT=lex.yy - AC_SUBST(LEX_OUTPUT_ROOT)dnl --else -+], [: - AC_PROG_LEX - AC_DECL_YYTEXT --fi]) -+])]) diff --git a/pkgs/tools/text/recode/recode-3.6-gettextfix.diff b/pkgs/tools/text/recode/recode-3.6-gettextfix.diff deleted file mode 100644 index 3b7eb8ba20e6..000000000000 --- a/pkgs/tools/text/recode/recode-3.6-gettextfix.diff +++ /dev/null @@ -1,23 +0,0 @@ -http://bugs.gentoo.org/239372 - -patch by Dmitry Karasik - ---- recode-3.6/m4/gettext.m4 -+++ recode-3.6/m4/gettext.m4 -@@ -109,12 +109,12 @@ - else - ac_items="$LINGUAS" - for ac_item in $ac_items; do -- case "$ALL_LINGUAS" in -- *$ac_item*) -+ for supported_item in $ALL_LINGUAS; do -+ if test "$ac_item" = "$supported_item"; then - ac_print="$ac_print $ac_item" - MOFILES="$MOFILES $ac_item.mo" -- ;; -- esac -+ fi -+ done - done - fi - AC_SUBST(MOFILES) |