* redland: make the dependency on postgresql, mysql, sqlite and db4

optional.  It's really not necessary for KDE to depend on four
  different databases...

svn path=/nixpkgs/trunk/; revision=19932

pkgs/applications/audio/ardour/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     scons boost
-    pkgconfig fftw redland librdf_raptor librdf_rasqal jackaudio flac
+    pkgconfig fftw librdf_raptor librdf_rasqal jackaudio flac
     libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx libusb cairomm
     glib pango gtk glibmm gtkmm libgnomecanvas fftw librdf liblo aubio
     fftw fftwSinglePrec libmad
@@ -25,12 +25,13 @@ stdenv.mkDerivation {
     export CXX=g++
     scons PREFIX=$out install
   '';
+  
   installPhase = ":";
 
   meta = { 
-    description = "multi-track hard disk recording software";
+    description = "Multi-track hard disk recording software";
     longDescription = ''
-      Also read "the importance of Paying Something on their homepage, pelase!"
+      Also read "The importance of Paying Something" on their homepage, please!
     '';
     homepage = http://ardour.org/;
     license = "GPLv2";

pkgs/development/libraries/redland/1.0.10.nix

@@ -1,4 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
+, curl, pcre, libxml2, librdf_rasqal, librdf_raptor
+, mysql ? null, postgresql ? null, sqlite ? null, bdb ? null
+}:
 
 stdenv.mkDerivation rec {
   name = "redland-1.0.10";  
@@ -8,15 +11,17 @@ stdenv.mkDerivation rec {
     sha256 = "05cq722qvw5sq08qbydzjv5snqk402cbdsy8s6qjzir7vq2hs1p3";
   };
 
-  buildInputs = [pkgconfig];
+  buildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [
     bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
     librdf_raptor librdf_rasqal
   ];
 
-  configureFlags = "--with-threads --with-bdb=${bdb}";
+  configureFlags =
-
+    [ "--with-threads" ]
+    ++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}";
+  
   patchPhase =
     ''
       sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl

pkgs/development/libraries/redland/1.0.8.nix

@@ -1,4 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
+, curl, pcre, libxml2, librdf_rasqal, librdf_raptor
+, mysql ? null, postgresql ? null, sqlite ? null, bdb ? null
+}:
 
 stdenv.mkDerivation rec {
   name = "redland-1.0.8";
@@ -8,14 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "8a77fcfd20fea2c6e53761d6dcbbee3fdb35e5308de36c1daa0d2014e5a96afe";
   };
   
-  buildInputs = [pkgconfig librdf_raptor];
+  buildInputs = [ pkgconfig ];
   
-  propagatedBuildInputs = [
+  propagatedBuildInputs =
-    bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
+    [ bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
-    librdf_rasqal librdf_raptor
+      librdf_rasqal librdf_raptor
-  ];
+    ];
     
-  configureFlags = "--with-threads --with-bdb=${bdb}";
+  configureFlags =
+    [ "--with-threads" ]
+    ++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}";
   
   patchPhase =
     ''

pkgs/development/libraries/redland/1.0.9.nix

@@ -1,30 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "redland-1.0.9";  
-
-  src = fetchurl {
-    url = "mirror://sf/librdf/${name}.tar.gz";
-    sha256 = "aa90ded84f5dd4cc2330bf79d139e00ceb93c6a9b94d17e1a93449ad579e1524";
-  };
-
-  buildInputs = [pkgconfig];
-
-  propagatedBuildInputs = [
-    bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
-    librdf_raptor librdf_rasqal
-  ];
-
-  configureFlags = "--with-threads --with-bdb=${bdb}";
-
-  patchPhase =
-    ''
-      sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl
-
-      # Redland 1.0.9 uses an internal pre-processor symbol SQLITE_API
-      # that collides with a symbol of the same name in sqlite 3.6.19.
-      # This is a quick fix for the problem. A real solution needs to be
-      # implemented upstream, though.
-      find . -type f -exec sed -i -e 's/SQLITE_API/REDLAND_SQLITE_API/g' {} \;
-    '';
-}

pkgs/top-level/all-packages.nix

@@ -4799,28 +4799,25 @@ let
   librdf_raptor = import ../development/libraries/librdf/raptor.nix {
     inherit fetchurl stdenv lib libxml2 curl;
   };
+  
   librdf_rasqal = import ../development/libraries/librdf/rasqal.nix {
     inherit fetchurl stdenv lib pcre libxml2 gmp librdf_raptor;
   };
+  
   librdf = import ../development/libraries/librdf {
     inherit fetchurl stdenv lib pkgconfig librdf_raptor ladspaH openssl zlib;
   };
 
-  # Also known as librdf, includes raptor and rasqal
+  redland = redland_1_0_10;
-  redland = composedArgsAndFun (import ../development/libraries/redland/1.0.9.nix) {
+  
-    inherit fetchurl stdenv openssl libxml2 pkgconfig perl postgresql sqlite
+  redland_1_0_8 = makeOverridable (import ../development/libraries/redland/1.0.8.nix) {
-      mysql libxslt curl pcre librdf_rasqal librdf_raptor;
+    inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite
+      libxslt curl pcre librdf_rasqal librdf_raptor;
     bdb = db4;
   };
 
-  redland_1_0_8 = composedArgsAndFun (import ../development/libraries/redland/1.0.8.nix) {
+  redland_1_0_10 = makeOverridable (import ../development/libraries/redland/1.0.10.nix) {
-    inherit fetchurl stdenv openssl libxml2 pkgconfig perl postgresql sqlite
+    inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite
-      mysql libxslt curl pcre librdf_rasqal librdf_raptor;
-    bdb = db4;
-  };
-
-  redland_1_0_10 = composedArgsAndFun (import ../development/libraries/redland/1.0.10.nix) {
-    inherit fetchurl stdenv openssl libxml2 pkgconfig perl postgresql sqlite
       mysql libxslt curl pcre librdf_rasqal librdf_raptor;
     bdb = db4;
   };