alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Subversion 1.5: fix building the Apache module and the

Browse source 
Python/Perl bindings.

svn path=/nixpkgs/trunk/; revision=12979
This commit is contained in:
Eelco Dolstra 2008-10-06 23:01:54 +00:00
parent 3ec9838a44
commit a4b6f1066c
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/applications/version-management/subversion-1.5.x/default.nix
View file

@ -29,9 +29,10 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [zlib apr aprutil] buildInputs = [zlib apr aprutil]
++ stdenv.lib.optional httpSupport neon; ++ stdenv.lib.optional httpSupport neon
++ stdenv.lib.optional pythonBindings swig.python
inherit perlBindings; # set a flag (see git expression) ++ stdenv.lib.optional perlBindings swig.perl
;
configureFlags = '' configureFlags = ''
--disable-static --disable-static
@ -43,15 +44,30 @@ stdenv.mkDerivation rec {
--disable-neon-version-check --disable-neon-version-check
''; '';
preBuild = ''
makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)
'';
postInstall = '' postInstall = ''
ensureDir $out/share/emacs/site-lisp ensureDir $out/share/emacs/site-lisp
cp contrib/client-side/emacs/*.el $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;
inherit perlBindings pythonBindings;
python = if swig != null && swig ? python then swig.python else null;
};
meta = { meta = {
description = "A version control system intended to be a compelling replacement for CVS in the open source community"; description = "A version control system intended to be a compelling replacement for CVS in the open source community";

2
pkgs/top-level/all-packages.nix
View file

@ -6832,7 +6832,7 @@ let
httpd = apacheHttpd; 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; inherit fetchurl stdenv apr aprutil expat swig zlib jdk;
neon = neon028; neon = neon028;
bdbSupport = getConfig ["subversion" "bdbSupport"] true; bdbSupport = getConfig ["subversion" "bdbSupport"] true;