From dd19f0b526d1ce61032956d6a24771acf9016726 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Aug 2003 10:06:23 +0000 Subject: [PATCH] * Make fetchsvn dependent on Subversion. svn path=/nixpkgs/trunk/; revision=301 --- pkgs/fetchsvn/fetchsvn.fix | 14 +++++++++++--- pkgs/fetchsvn/fetchsvn.sh | 3 +-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/fetchsvn/fetchsvn.fix b/pkgs/fetchsvn/fetchsvn.fix index b1d28adbb996..2417a5ca4801 100644 --- a/pkgs/fetchsvn/fetchsvn.fix +++ b/pkgs/fetchsvn/fetchsvn.fix @@ -1,9 +1,17 @@ Function(["name","url","rev"], Package( - [ ("name", Var("name")) + [ ("name", Var("name")) , ("build", Relative("fetchsvn/fetchsvn.sh")) - , ("url", Var("url")) - , ("rev", Var("rev")) + , ("url", Var("url")) + , ("rev", Var("rev")) + + , ("svn", Call(IncludeFix("subversion/subversion.fix"), + [ ("localServer", True) + , ("httpsClient", True) + , ("httpServer", True) + , ("pythonBindings", True) + ])) + ] ) ) \ No newline at end of file diff --git a/pkgs/fetchsvn/fetchsvn.sh b/pkgs/fetchsvn/fetchsvn.sh index 8185d3e09285..64b489f0e3da 100755 --- a/pkgs/fetchsvn/fetchsvn.sh +++ b/pkgs/fetchsvn/fetchsvn.sh @@ -2,5 +2,4 @@ echo "exporting svn repository $url (at rev $rev) into $out..." -svn export -r $rev $url $out || exit 1 - +$svn/bin/svn export -r $rev $url $out || exit 1