From 07b84525a90b1ad5a512d60f97be26f965578826 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 12 Jul 2003 19:45:31 +0000 Subject: [PATCH] * Propagate libraries. svn path=/nixpkgs/trunk/; revision=154 --- pkgs/subversion/subversion-build.sh | 5 ++++- pkgs/subversion/subversion.fix | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/subversion/subversion-build.sh b/pkgs/subversion/subversion-build.sh index d4b279df222..473925d9bae 100755 --- a/pkgs/subversion/subversion-build.sh +++ b/pkgs/subversion/subversion-build.sh @@ -1,7 +1,8 @@ #! /bin/sh export PATH=$libxml/bin:/bin:/usr/bin:/usr/local/bin -export LD_LIBRARY_PATH=$ssl/lib: +envpkgs="$ssl $db4 $httpd $swig" +. $setenv export LDFLAGS=-s @@ -34,3 +35,5 @@ if test $pythonBindings; then make swig-py || exit 1 make install-swig-py || exit 1 fi + +echo $envpkgs > $out/envpkgs || exit 1 diff --git a/pkgs/subversion/subversion.fix b/pkgs/subversion/subversion.fix index 13e7f5f00a6..dafeb5956a5 100644 --- a/pkgs/subversion/subversion.fix +++ b/pkgs/subversion/subversion.fix @@ -1,10 +1,14 @@ Package( [ ("name", "subversion-0.25.0") + , ("build", Relative("subversion/subversion-build.sh")) + , ("setenv", Relative("helpers/set-env.sh")) + , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), [ ("url", "http://subversion.tigris.org/files/documents/15/5110/subversion-0.25.tar.gz") , ("md5", "a018220d5c790161bc712ccb7d0f1b38") ])) + , ("httpsClient", "1") , ("ssl", IncludeFix("openssl/openssl.fix")) ]