autogen: 5.18 -> 5.18.5

1 files changed, 30 insertions, 55 deletions

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 01c5fd7dcba..71ea938ea78 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -1,55 +1,30 @@
-{ fetchurl, stdenv, guile, which, libffi }:
-
-let version = "5.18"; in
-
-  stdenv.mkDerivation {
-    name = "autogen-${version}";
-
-    src = fetchurl {
-      url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz";
-      sha256 = "1h2d3wpzkla42igxyisaqh2nwpq01vwad1wp9671xmm5ahvkw5f7";
-    };
-
-    buildInputs = [ guile which libffi ];
-
-    patchPhase =
-      '' for i in $(find -name \*.in)
-         do
-           sed -i "$i" -e's|/usr/bin/||g'
-         done
-      '';
-
-    # The tests rely on being able to find `libopts.a'.
-    configureFlags = "--enable-static";
-
-    #doCheck = true; # 2 tests fail because of missing /dev/tty
-
-    meta = with stdenv.lib; {
-      description = "Automated text and program generation tool";
-
-      longDescription = ''
-        AutoGen is a tool designed to simplify the creation and maintenance
-        of programs that contain large amounts of repetitious text.  It is
-        especially valuable in programs that have several blocks of text that
-        must be kept synchronized.
-
-        AutoGen can now accept XML files as definition input, in addition to
-        CGI data (for producing dynamic HTML) and traditional AutoGen
-        definitions.
-
-        A common example where this would be useful is in creating and
-        maintaining the code required for processing program options.
-        Processing options requires multiple constructs to be maintained in
-        parallel in different places in your program.  Options maintenance
-        needs to be done countless times.  So, AutoGen comes with an add-on
-        package named AutoOpts that simplifies the maintenance and
-        documentation of program options.
-      '';
-
-      license = with licenses; [ gpl3Plus lgpl3Plus ];
-
-      homepage = http://www.gnu.org/software/autogen/;
-
-      maintainers = [ ];
-    };
-  }
+{ stdenv, fetchurl, which, pkgconfig, perl, guile, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "autogen-${version}";
+  version = "5.18.5";
+
+  src = fetchurl {
+    url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz";
+    sha256 = "1flnbnmkbqmbfgammkl8m36wrlk6rhpgnf9pdm6gdfhqalxvggbv";
+  };
+
+  nativeBuildInputs = [ which pkgconfig perl ];
+  buildInputs = [ guile libxml2 ];
+
+  postPatch = ''
+    # Fix a broken sed expression used for detecting the minor
+    # version of guile we are using
+    sed -i "s,sed '.*-I.*',sed 's/\\\(^\\\| \\\)-I/\\\1/g',g" configure
+  '';
+
+  #doCheck = true; # 2 tests fail because of missing /dev/tty
+
+  meta = with stdenv.lib; {
+    description = "Automated text and program generation tool";
+    license = with licenses; [ gpl3Plus lgpl3Plus ];
+    homepage = http://www.gnu.org/software/autogen/;
+    platforms = platforms.all;
+    maintainers = [ ];
+  };
+}