nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of redland-1.0.8

Browse Source 
1.0.9 was buggy, but it is fixed in 1.0.10

svn path=/nixpkgs/trunk/; revision=20930
This commit is contained in:
Yury G. Kudryashov 2010-04-03 09:54:22 +00:00
parent e523ba1732
commit f0f1958830
5 changed files with 4 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/kde-4.3/default.nix
View File

@ -23,8 +23,7 @@ pkgs.recurseIntoAttrs (rec {
soprano = import ./support/soprano {
inherit (pkgs) stdenv fetchurl lib cmake;
inherit (pkgs) qt4 cluceneCore;
redland = pkgs.redland_1_0_8;
inherit (pkgs) qt4 cluceneCore redland;
};
qimageblitz = import ./support/qimageblitz {

3
pkgs/desktops/kde-4.4/default.nix
View File

@ -23,8 +23,7 @@ pkgs.recurseIntoAttrs (rec {
soprano = import ./support/soprano {
inherit (pkgs) stdenv fetchurl lib cmake;
inherit (pkgs) qt4 cluceneCore;
redland = pkgs.redland_1_0_8;
inherit (pkgs) qt4 cluceneCore redland;
};
qimageblitz = import ./support/qimageblitz {

11
pkgs/development/libraries/redland/1.0.10.nix
View File

@ -22,14 +22,5 @@ stdenv.mkDerivation rec {
[ "--with-threads" ]
++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}";
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' {} \;
'';
patchPhase ="sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl";
}

35
pkgs/development/libraries/redland/1.0.8.nix
View File

@ -1,35 +0,0 @@
{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
, curl, pcre, libxml2, librdf_rasqal, librdf_raptor
, mysql ? null, postgresql ? null, sqlite ? null, bdb ? null
}:
stdenv.mkDerivation rec {
name = "redland-1.0.8";
src = fetchurl {
url = "mirror://sf/librdf/${name}.tar.gz";
sha256 = "8a77fcfd20fea2c6e53761d6dcbbee3fdb35e5308de36c1daa0d2014e5a96afe";
};
buildInputs = [ pkgconfig ];
propagatedBuildInputs =
[ bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
librdf_rasqal librdf_raptor
];
configureFlags =
[ "--with-threads" ]
++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}";
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' {} \;
'';
}

10
pkgs/top-level/all-packages.nix
View File

@ -4912,15 +4912,7 @@ let
inherit fetchurl stdenv lib pkgconfig librdf_raptor ladspaH openssl zlib;
};
redland = redland_1_0_10;
redland_1_0_8 = makeOverridable (import ../development/libraries/redland/1.0.8.nix) {
inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite
libxslt curl pcre librdf_rasqal librdf_raptor;
bdb = db4;
};
redland_1_0_10 = makeOverridable (import ../development/libraries/redland/1.0.10.nix) {
redland = makeOverridable (import ../development/libraries/redland/1.0.10.nix) {
inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite
mysql libxslt curl pcre librdf_rasqal librdf_raptor;
bdb = db4;