From 3c1304aef23c2dbd063af2cf55f00b0e37927982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 5 Jan 2010 11:16:30 +0000
Subject: [PATCH] GNU libextractor 0.5.23.

svn path=/nixpkgs/trunk/; revision=19216
---
 .../libraries/libextractor/0.5.18.nix         | 21 ------
 .../libraries/libextractor/default.nix        | 64 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 +-
 3 files changed, 69 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/development/libraries/libextractor/0.5.18.nix
 create mode 100644 pkgs/development/libraries/libextractor/default.nix

diff --git a/pkgs/development/libraries/libextractor/0.5.18.nix b/pkgs/development/libraries/libextractor/0.5.18.nix
deleted file mode 100644
index 557369bd76c7..000000000000
--- a/pkgs/development/libraries/libextractor/0.5.18.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://gnunet.org/libextractor/download/libextractor-0.5.18.tar.gz;
-			sha256 = "09y869zmnr6n2953ra4y7z9m9nj23prlqa4nr4rwcb50dzdmil1k";
-		};
-
-		buildInputs = [ zlib];
-		configureFlags = [];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "libextractor-0.5.18";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "A tool to extract metadata from files";
-		inherit src;
-	};
-}
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
new file mode 100644
index 000000000000..a134fbacf0b2
--- /dev/null
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -0,0 +1,64 @@
+{ fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis, libmpeg2
+, ffmpeg, exiv2, libgsf, rpm, pkgconfig, glib, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "libextractor-0.5.23";
+
+  src = fetchurl {
+    url = "mirror://gnu/libextractor/${name}.tar.gz";
+    sha256 = "1zyfshayjrp7kd87pm7blyq0dvbv5bbh3f368pp4jws4qxs8aj9f";
+  };
+
+  preConfigure =
+    '' echo "patching installation directory in \`extractor.c'..."
+       sed -i "src/main/extractor.c" \
+           -e "s|pexe[[:blank:]]*=.*$|pexe = strdup(\"$out/lib/\");|g"
+    '';
+
+  buildInputs =
+   [ libtool gettext zlib bzip2 flac libvorbis libmpeg2 exiv2 ffmpeg
+     libgsf rpm
+     pkgconfig glib gtk
+   ];
+
+  configureFlags = "--disable-ltdl-install "
+    + "--with-ltdl-include=${libtool}/include "
+    + "--with-ltdl-lib=${libtool}/lib "
+    + "--enable-xpdf";
+
+  # Checks need to be run after "make install", otherwise plug-ins are not in
+  # the search path, etc.
+  # FIXME: Tests currently fail and the test framework appears to be deeply
+  # broken anyway.
+  doCheck = false;
+  #postInstall = "make check";
+
+  meta = {
+    description = "GNU libextractor, a simple library for keyword extraction";
+
+    longDescription =
+      '' GNU libextractor is a library used to extract meta-data from files
+         of arbitrary type.  It is designed to use helper-libraries to perform
+         the actual extraction, and to be trivially extendable by linking
+         against external extractors for additional file types.
+
+         The goal is to provide developers of file-sharing networks or
+         WWW-indexing bots with a universal library to obtain simple keywords
+         to match against queries.  libextractor contains a shell-command
+         extract that, similar to the well-known file command, can extract
+         meta-data from a file an print the results to stdout.
+
+         Currently, libextractor supports the following formats: HTML, PDF,
+         PS, OLE2 (DOC, XLS, PPT), OpenOffice (sxw), StarOffice (sdw), DVI,
+         MAN, FLAC, MP3 (ID3v1 and ID3v2), NSF(E) (NES music), SID (C64
+         music), OGG, WAV, EXIV2, JPEG, GIF, PNG, TIFF, DEB, RPM, TAR(.GZ),
+         ZIP, ELF, S3M (Scream Tracker 3), XM (eXtended Module), IT (Impulse
+         Tracker), FLV, REAL, RIFF (AVI), MPEG, QT and ASF.  Also, various
+         additional MIME types are detected.
+      '';
+
+    license = "GPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff51c4827530..bba2053de3d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3854,8 +3854,11 @@ let
     inherit fetchurl stdenv gettext;
   };
 
-  libextractor = composedArgsAndFun (import ../development/libraries/libextractor/0.5.18.nix) {
-    inherit fetchurl stdenv builderDefs zlib;
+  libextractor = import ../development/libraries/libextractor {
+    inherit fetchurl stdenv libtool gettext zlib bzip2 flac libvorbis
+     exiv2 ffmpeg libgsf glib rpm pkgconfig;
+    inherit (gnome) gtk;
+    libmpeg2 = mpeg2dec;
   };
 
   libffcall = builderDefsPackage (import ../development/libraries/libffcall) {