From f08bc4c561613ffff7bccd91b0d681ee71c5fd51 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Nov 2009 08:19:35 +0000 Subject: [PATCH] * Apply the Redland fix to version 1.0.8 as well (since that's what KDE 4.3 uses). svn path=/nixpkgs/trunk/; revision=18127 --- pkgs/development/libraries/redland/1.0.8.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/redland/1.0.8.nix b/pkgs/development/libraries/redland/1.0.8.nix index f7699b1e37fc..9b065043178a 100644 --- a/pkgs/development/libraries/redland/1.0.8.nix +++ b/pkgs/development/libraries/redland/1.0.8.nix @@ -20,5 +20,14 @@ stdenv.mkDerivation { 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' {} \; + ''; }