redland 1.0.9 breaks kde-4.3. So also provide 1.0.8

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

2 files changed, 31 insertions, 3 deletions

diff --git a/pkgs/development/libraries/redland/1.0.8.nix b/pkgs/development/libraries/redland/1.0.8.nix
new file mode 100644
index 00000000000..f7699b1e37f
--- /dev/null
+++ b/pkgs/development/libraries/redland/1.0.8.nix
@@ -0,0 +1,24 @@
+args: with args;
+
+let name = "redland-${version}";
+in 
+
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "mirror://sf/librdf/${name}.tar.gz";
+    sha256 = "8a77fcfd20fea2c6e53761d6dcbbee3fdb35e5308de36c1daa0d2014e5a96afe";
+  };
+  
+  buildInputs = [pkgconfig librdf_raptor];
+  
+  propagatedBuildInputs = [
+    bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
+    librdf_rasqal librdf_raptor
+  ];
+    
+  configureFlags = "--with-threads --with-bdb=${bdb}";
+  
+  patchPhase = "sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl";
+}
diff --git a/pkgs/development/libraries/redland/default.nix b/pkgs/development/libraries/redland/1.0.9.nix
index 94e8a98f7c0..313a8f28a6f 100644
--- a/pkgs/development/libraries/redland/default.nix
+++ b/pkgs/development/libraries/redland/1.0.9.nix
@@ -1,17 +1,21 @@
 args: with args;
 
-stdenv.mkDerivation rec {
-  name = "redland-1.0.7";
+let name = "redland-${version}";
+in 
+
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "mirror://sf/librdf/${name}.tar.gz";
-    sha256 = "1z160hhrnlyy5c8vh2hjza6kdfmzml8mg9dk8yffifkhnxjq5r2z";
+    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}";