recode-3.7-git

1 files changed, 9 insertions, 36 deletions

diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix
index e7c5997021db..f1972e085f58 100644
--- a/pkgs/tools/text/recode/default.nix
+++ b/pkgs/tools/text/recode/default.nix
@@ -1,46 +1,19 @@
-{stdenv, fetchurl, autoconf, automake, libtool, gettext, perl}:
+{stdenv, fetchgit}:
 
-let
-  asIfPatch = ./recode-3.6-as-if.patch;
+stdenv.mkDerivation rec {
+  name = "recode-3.7-pff85fdbd";
 
-  gettextPatch = ./recode-3.6-gettextfix.diff;
-
-  debianPatch = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-15.diff.gz";
-    sha256 = "114qxm29wk95w5760bswgd46d5p00g5kbfai5wchjvcbi722p5qf";
-  };
-in
-stdenv.mkDerivation {
-  name = "recode-3.6";
-
-  src = fetchurl {
-    url = "ftp://ftp.halifax.rwth-aachen.de/gnu/recode/recode-3.6.tar.gz";
-    sha256 = "1krgjqfhsxcls4qvxhagc45sm1sd0w69jm81nwm0bip5z3rs9rp3";
+  src = fetchgit {
+    url = https://github.com/pinard/Recode.git;
+    rev = "2fd8385658e5a08700e3b916053f6680ff85fdbd";
+    sha256 = "1xhlfmqld6af16l444jli9crj9brym2jihg1n6lkxh2gar68f5l7";
   };
 
-  buildInputs = [ autoconf automake libtool gettext perl ];
-
-  patchPhase = ''
-    patch -Np1 -i ${asIfPatch}
-    patch -Np1 -i ${gettextPatch}
-    gunzip <${debianPatch} | patch -Np1 -i -
-    sed -i '1i#include <stdlib.h>' src/argmatch.c
-    rm -f acinclude.m4
-    autoreconf -fi
-    libtoolize
-  '';
-
-  configureFlags = "--without-included-gettext";
-
-  doCheck = true;
-
   meta = {
     homepage = "http://www.gnu.org/software/recode/";
     description = "Converts files between various character sets and usages";
-
-    license = "GPLv2+";
-
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [];
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ jcumming ];
   };
 }