From e6a64be5c8eaf4a99942eb7fbf6c02d04ff2ebfd Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 31 Jan 2008 10:40:02 +0000 Subject: [PATCH] subversion: using getConfig svn path=/nixpkgs/branches/stdenv-updates/; revision=10426 --- 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 b4b731b7b2e..eb1daf82d80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4602,12 +4602,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; };