From 40e41fe36263215d0f1dab6721c389f819a18377 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 10 Feb 2008 17:42:11 +0000
Subject: [PATCH] redland: more dependencies
svn path=/nixpkgs/branches/stdenv-updates/; revision=10615
---
pkgs/development/libraries/redland/default.nix | 8 +++++---
pkgs/top-level/all-packages.nix | 5 +++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/libraries/redland/default.nix b/pkgs/development/libraries/redland/default.nix
index 37d899feb70b..d344fbc0ac30 100644
--- a/pkgs/development/libraries/redland/default.nix
+++ b/pkgs/development/libraries/redland/default.nix
@@ -4,10 +4,12 @@ stdenv.mkDerivation rec {
name = "redland-1.0.7";
src = fetchurl {
- url = "sf://librdf/${name}.tar.gz";
+ url = "mirror://sf/librdf/${name}.tar.gz";
sha256 = "1z160hhrnlyy5c8vh2hjza6kdfmzml8mg9dk8yffifkhnxjq5r2z";
};
- buildInputs = [ bdb openssl libxml2 pkgconfig perl];
- configureFlags="--without-static --with-threads --with-bdb=${bdb}";
+ buildInputs = [pkgconfig];
+ propagatedBuildInputs = [ bdb openssl libxslt perl mysql postgresql sqlite
+ curl pcre];
+ configureFlags = "--disable-static --with-threads --with-bdb=${bdb}";
patchPhase="sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl";
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efe3eae576aa..7f7127e791f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2592,8 +2592,9 @@ rec {
# Also known as librdf, includes raptor and rasqal
redland = import ../development/libraries/redland {
- inherit fetchurl stdenv openssl libxml2 pkgconfig perl;
- bdb = db4;
+ inherit fetchurl stdenv openssl libxml2 pkgconfig perl postgresql sqlite
+ mysql libxslt curl pcre;
+ bdb = db4;
};
rte = import ../development/libraries/rte {