From 47a16b87d6243ed0581166970ee3731a6fb51e46 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 30 Jan 2008 15:15:53 +0000 Subject: [PATCH] subversion: using getConfig svn path=/nixpkgs/trunk/; revision=10411 --- pkgs/top-level/all-packages.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed68c349e69..f0ea50d6869 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4791,12 +4791,14 @@ rec { }; subversion14 = import ../applications/version-management/subversion-1.4.x { - inherit fetchurl stdenv apr aprutil neon expat swig zlib; - bdbSupport = true; - httpServer = false; + inherit fetchurl stdenv apr aprutil neon expat swig zlib jdk; + bdbSupport = getConfig ["subversion" "bdbSupport"] true; + httpServer = getConfig ["subversion" "httpServer"] false; + sslSupport = getConfig ["subversion" "sslSupport"] true; + pythonBindings = getConfig ["subversion" "pythonBindings"] false; perlBindings = getConfig ["subversion" "perlBindings"] false; - sslSupport = true; - compressionSupport = true; + javahlBindings = getConfig ["subversion" "javahlBindings"] false; + compressionSupport = getConfig ["subversion" "compressionSupport"] true; httpd = apacheHttpd; };