* 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
This commit is contained in:
parent
b039fddfbc
commit
f08bc4c561
@ -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' {} \;
|
||||
'';
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user