diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2003-12-21 20:52:13 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2003-12-21 20:52:13 +0000 |
| commit | 480d68ece32776b4d419846e20c9aece96680491 (patch) | |
| tree | 48c4ad9c1a9ed52b71b28761454392a23bce9bcc /pkgs/applications | |
| parent | 38bc744a0b7bd38f556a9db46f8acb30e918e95f (diff) | |
| download | nixpkgs-480d68ece32776b4d419846e20c9aece96680491.tar nixpkgs-480d68ece32776b4d419846e20c9aece96680491.tar.gz nixpkgs-480d68ece32776b4d419846e20c9aece96680491.tar.bz2 nixpkgs-480d68ece32776b4d419846e20c9aece96680491.tar.lz nixpkgs-480d68ece32776b4d419846e20c9aece96680491.tar.xz nixpkgs-480d68ece32776b4d419846e20c9aece96680491.tar.zst nixpkgs-480d68ece32776b4d419846e20c9aece96680491.zip | |
* Added some missing semicolons.
* Some packages needed for the Subversion server. svn path=/nixpkgs/trunk/; revision=586
Diffstat (limited to 'pkgs/applications')
| -rwxr-xr-x | pkgs/applications/version-management/subversion/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/subversion/builder.sh b/pkgs/applications/version-management/subversion/builder.sh index 72848c79532..1a4e4033d22 100755 --- a/pkgs/applications/version-management/subversion/builder.sh +++ b/pkgs/applications/version-management/subversion/builder.sh @@ -1,6 +1,6 @@ #! /bin/sh -buildinputs="$openssl $db4 $httpd $swig $expat" +buildinputs="$openssl $db4 $httpd $swig $python $expat" . $stdenv/setup || exit 1 if test $localServer; then diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 76a46511b27..ff03c9514e8 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -10,7 +10,7 @@ assert !isNull expat; assert localServer -> !isNull db4; assert httpServer -> !isNull httpd && httpd.expat == expat; assert sslSupport -> !isNull openssl && (httpServer -> httpd.openssl == openssl); -assert swigBindings -> !isNull swig; +assert swigBindings -> !isNull swig && swig.pythonSupport; derivation { name = "subversion-0.32.1"; @@ -33,4 +33,5 @@ derivation { expat = expat; db4 = if localServer then db4 else null; swig = if swigBindings then swig else null; + python = if swigBindings then swig.python else null; } |