redland 1.0.9 breaks kde-4.3. So also provide 1.0.8

svn path=/nixpkgs/trunk/; revision=17357
This commit is contained in:
Marc Weber 2009-09-22 23:07:35 +00:00
parent 04558d8496
commit 47828714e4
4 changed files with 36 additions and 6 deletions

View file

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

View file

@ -0,0 +1,24 @@
args: with args;
let name = "redland-${version}";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sf/librdf/${name}.tar.gz";
sha256 = "8a77fcfd20fea2c6e53761d6dcbbee3fdb35e5308de36c1daa0d2014e5a96afe";
};
buildInputs = [pkgconfig librdf_raptor];
propagatedBuildInputs = [
bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
librdf_rasqal librdf_raptor
];
configureFlags = "--with-threads --with-bdb=${bdb}";
patchPhase = "sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl";
}

View file

@ -1,17 +1,21 @@
args: with args;
stdenv.mkDerivation rec {
name = "redland-1.0.7";
let name = "redland-${version}";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sf/librdf/${name}.tar.gz";
sha256 = "1z160hhrnlyy5c8vh2hjza6kdfmzml8mg9dk8yffifkhnxjq5r2z";
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}";

View file

@ -4170,11 +4170,12 @@ let
};
# Also known as librdf, includes raptor and rasqal
redland = import ../development/libraries/redland {
redland = composedArgsAndFun (selectVersion ../development/libraries/redland "1.0.9") {
inherit fetchurl stdenv openssl libxml2 pkgconfig perl postgresql sqlite
mysql libxslt curl pcre;
mysql libxslt curl pcre librdf_rasqal librdf_raptor;
bdb = db4;
};
redland_1_0_8 = redland.passthru.function { version = "1.0.8"; };
rte = import ../development/libraries/rte {
inherit fetchurl stdenv;