libdbi-drivers: 0.8.3-1 -> 0.9.0

1 files changed, 49 insertions, 19 deletions

diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index 6f61d9b3cad..542aa3cb340 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -1,31 +1,61 @@
-{ stdenv, fetchurl, libdbi, mysql ? null, sqlite ? null }:
+{ stdenv, fetchurl, libdbi
+, mysql ? null, sqlite ? null, postgresql ? null
+}:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libdbi-drivers-0.8.3-1";
+  name = "libdbi-drivers-0.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/libdbi-drivers/${name}.tar.gz";
-    sha256 = "0wng59xnq8jjyp6f3bfjrhjvqrswamrjykdnxq6rqxnfk11r9faa";
+    sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
   };
 
-  buildInputs = [ libdbi mysql sqlite ];
-
-  configureFlags =
-    [ "--disable-docs"
-      "--enable-libdbi"
-      "--with-dbi-incdir=${libdbi}/include"
-      "--with-dbi-libdir=${libdbi}/lib"
-    ] ++ stdenv.lib.optionals (mysql != null)
-    [ "--with-mysql"
-      "--with-mysql-incdir=${mysql}/include/mysql"
-      "--with-mysql-libdir=${mysql}/lib/mysql"
-    ] ++ stdenv.lib.optionals (sqlite != null)
-    [ "--with-sqlite3"
-      "--with-sqlite3-incdir=${sqlite}/include/sqlite"
-      "--with-sqlite3-libdir=${sqlite}/lib/sqlite"
-    ];
+  buildInputs = [ libdbi mysql sqlite postgresql ];
+
+  postPatch = ''
+    sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
+  '';
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--disable-docs"
+    "--enable-libdbi"
+    "--with-dbi-incdir=${libdbi}/include"
+    "--with-dbi-libdir=${libdbi}/lib"
+  ] ++ optionals (mysql != null) [
+    "--with-mysql"
+    "--with-mysql-incdir=${mysql}/include/mysql"
+    "--with-mysql-libdir=${mysql}/lib/mysql"
+  ] ++ optionals (postgresql != null) [
+    "--with-pgsql"
+    "--with-pgsql_incdir=${postgresql}/include"
+    "--with-pgsql_libdir=${postgresql}/lib"
+  ] ++ optionals (sqlite != null) [
+    "--with-sqlite3"
+    "--with-sqlite3-incdir=${sqlite}/include/sqlite"
+    "--with-sqlite3-libdir=${sqlite}/lib/sqlite"
+  ];
+
+  installFlags = [ "DESTDIR=\${out}" ];
+
+  postInstall = ''
+    mv $out/$out/* $out
+    DIR=$out/$out
+    while rmdir $DIR 2>/dev/null; do
+      DIR="$(dirname "$DIR")"
+    done
+
+    # Remove the unneeded var/lib directories
+    rm -rf $out/var
+  '';
     
   meta = {
+    homepage = http://libdbi-drivers.sourceforge.net/;
     description = "Database drivers for libdbi";
+    platforms = platforms.all;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ wkennington ];
   };
 }