diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-05 08:19:35 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-05 08:19:35 +0000 |
| commit | f08bc4c561613ffff7bccd91b0d681ee71c5fd51 (patch) | |
| tree | f71a84a6a1c51fdcab16dc503997d44964aa7aa7 /pkgs | |
| parent | b039fddfbc228cb254b5ef194399ec9bfc03ef27 (diff) | |
| download | nixlib-f08bc4c561613ffff7bccd91b0d681ee71c5fd51.tar nixlib-f08bc4c561613ffff7bccd91b0d681ee71c5fd51.tar.gz nixlib-f08bc4c561613ffff7bccd91b0d681ee71c5fd51.tar.bz2 nixlib-f08bc4c561613ffff7bccd91b0d681ee71c5fd51.tar.lz nixlib-f08bc4c561613ffff7bccd91b0d681ee71c5fd51.tar.xz nixlib-f08bc4c561613ffff7bccd91b0d681ee71c5fd51.tar.zst nixlib-f08bc4c561613ffff7bccd91b0d681ee71c5fd51.zip | |
* 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
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/redland/1.0.8.nix | 11 |
1 files changed, 10 insertions, 1 deletions
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' {} \; + ''; } |