* Sync with the trunk. backups/xorg-7.5@18179

svn path=/nixpkgs/branches/xorg-7.5/; revision=18122

1 files changed, 15 insertions, 6 deletions

diff --git a/pkgs/development/libraries/redland/1.0.9.nix b/pkgs/development/libraries/redland/1.0.9.nix
index 313a8f28a6faa..93606ad0eb581 100644
--- a/pkgs/development/libraries/redland/1.0.9.nix
+++ b/pkgs/development/libraries/redland/1.0.9.nix
@@ -1,7 +1,7 @@
 args: with args;
 
 let name = "redland-${version}";
-in 
+in
 
 stdenv.mkDerivation {
   inherit name;
@@ -10,15 +10,24 @@ stdenv.mkDerivation {
     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";
+
+  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' {} \;
+  '';
 }