From a4b6f1066cda791fe61843189ec4da1499be0900 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Oct 2008 23:01:54 +0000
Subject: [PATCH] * Subversion 1.5: fix building the Apache module and the  
 Python/Perl bindings.

svn path=/nixpkgs/trunk/; revision=12979
---
 .../subversion-1.5.x/default.nix              | 30 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/subversion-1.5.x/default.nix b/pkgs/applications/version-management/subversion-1.5.x/default.nix
index 2fca0994f17..30222fe58b3 100644
--- a/pkgs/applications/version-management/subversion-1.5.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.5.x/default.nix
@@ -29,9 +29,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [zlib apr aprutil]
-    ++ stdenv.lib.optional httpSupport neon;
-
-  inherit perlBindings; # set a flag (see git expression)
+    ++ stdenv.lib.optional httpSupport neon
+    ++ stdenv.lib.optional pythonBindings swig.python
+    ++ stdenv.lib.optional perlBindings swig.perl
+    ;
 
   configureFlags = ''
     --disable-static
@@ -43,15 +44,30 @@ stdenv.mkDerivation rec {
     --disable-neon-version-check
   '';
 
+  preBuild = ''
+    makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)
+  '';
+
   postInstall = ''
     ensureDir $out/share/emacs/site-lisp
     cp contrib/client-side/emacs/*.el $out/share/emacs/site-lisp/
+
+    if test "$pythonBindings"; then
+        make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn
+        make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn
+    fi
+    
+    if test "$perlBindings"; then
+        make swig-pl-lib
+        make install-swig-pl-lib
+        cd subversion/bindings/swig/perl/native
+        perl Makefile.PL PREFIX=$out
+        make install
+        cd -
+    fi
   ''; # */
 
-  passthru = {
-    inherit perlBindings pythonBindings;
-    python = if swig != null && swig ? python then swig.python else null;
-  };
+  inherit perlBindings pythonBindings;
 
   meta = {
     description = "A version control system intended to be a compelling replacement for CVS in the open source community";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 785c231723b..16b6a9f1c73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6832,7 +6832,7 @@ let
     httpd = apacheHttpd;
   };
 
-  subversion15 = import ../applications/version-management/subversion-1.5.x {
+  subversion15 = makeOverridable (import ../applications/version-management/subversion-1.5.x) {
     inherit fetchurl stdenv apr aprutil expat swig zlib jdk;
     neon = neon028;
     bdbSupport = getConfig ["subversion" "bdbSupport"] true;