redland-1.0.14, move to librdf/

* rename redland to librdf_redland
* add compatibility alias
* propagate some inputs

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

pkgs/development/libraries/librdf/rasqal.nix

@@ -8,7 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "1drjcy1k9g72iis0ghllzn7n0w03bahhrd2p5hs39anbm6mr0yk9";
   };
 
-  buildInputs = [ pkgconfig librdf_raptor2 gmp pcre libxml2 ];
+  buildNativeInputs = [ pkgconfig ];
+
+  buildInputs = [ gmp pcre libxml2 ];
+
+  propagatedBuildInputs = [ librdf_raptor2 ];
 
   postInstall = "rm -rvf $out/share/gtk-doc";
   

pkgs/development/libraries/librdf/redland.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
+, curl, pcre, libxml2, librdf_rasqal
+, mysql, withMysql ? false
+, postgresql, withPostgresql ? false
+, sqlite, withSqlite ? true
+, db4, withBdb ? false
+}:
+
+stdenv.mkDerivation rec {
+  name = "redland-1.0.14";
+
+  src = fetchurl {
+    url = "http://download.librdf.org/source/${name}.tar.gz";
+    sha256 = "1i460q9gslb7l75hjwc6w2kp2wk7fgp8lr7phamg33c6j013y30k";
+  };
+
+  buildNativeInputs = [ perl pkgconfig ];
+
+  buildInputs = [ openssl libxslt curl pcre libxml2 ]
+    ++ stdenv.lib.optional withMysql mysql
+    ++ stdenv.lib.optional withSqlite sqlite
+    ++ stdenv.lib.optional withPostgresql postgresql
+    ++ stdenv.lib.optional withBdb db4;
+
+  propagatedBuildInputs = [ librdf_rasqal ];
+
+  postInstall = "rm -rvf $out/share/gtk-doc";
+
+  configureFlags =
+    [ "--with-threads" ]
+    ++ stdenv.lib.optional withBdb "--with-bdb=${db4}";
+
+  meta = {
+    homepage = http://librdf.org/;
+  };
+}

pkgs/development/libraries/redland/1.0.10.nix

@@ -1,35 +0,0 @@
-{ 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";
-
-  src = fetchurl {
-    url = "http://download.librdf.org/source/${name}.tar.gz";
-    sha256 = "05cq722qvw5sq08qbydzjv5snqk402cbdsy8s6qjzir7vq2hs1p3";
-  };
-
-  buildInputs =
-    [ pkgconfig bdb openssl libxslt perl mysql postgresql sqlite curl
-      pcre libxml2
-    ];
-
-  propagatedBuildInputs = [ librdf_raptor librdf_rasqal ];
-
-  preConfigure =
-    ''
-      export NIX_LDFLAGS="$NIX_LDFLAGS -lrasqal -lraptor"
-    '';
-  
-  postInstall = "rm -rf $out/share/gtk-doc";
-  
-  configureFlags =
-    [ "--with-threads" ]
-    ++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}";
-
-  meta = {
-    homepage = http://librdf.org/;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -4319,15 +4319,13 @@ let
 
   librdf_rasqal = callPackage ../development/libraries/librdf/rasqal.nix { };
 
+  librdf_redland = callPackage ../development/libraries/librdf/redland.nix { };
+
   librdf = callPackage ../development/libraries/librdf { };
 
   qrupdate = callPackage ../development/libraries/qrupdate { };
 
-  redland = callPackage ../development/libraries/redland/1.0.10.nix {
+  redland = pkgs.librdf_redland;
-    bdb = db4;
-    postgresql = null;
-    mysql = null;
-  };
 
   rhino = callPackage ../development/libraries/java/rhino {
     ant = apacheAntGcj;