From a29bfb0d7bf8f6cc0ca66f0dadbf136aaf13b330 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 29 Apr 2009 17:03:29 +0000 Subject: [PATCH] * Use the default Subversion (1.6). svn path=/nixos/trunk/; revision=15407 --- upstart-jobs/apache-httpd/subversion.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix index a32e0bf5dbd..3c3e7173549 100644 --- a/upstart-jobs/apache-httpd/subversion.nix +++ b/upstart-jobs/apache-httpd/subversion.nix @@ -19,7 +19,7 @@ let # Build a Subversion instance with Apache modules and Swig/Python bindings. - subversion = pkgs.subversion15.override (origArgs: { + subversion = pkgs.subversion.override (origArgs: { bdbSupport = true; httpServer = true; sslSupport = true; @@ -53,7 +53,7 @@ let inherit (serverInfo.serverConfig) user group; # Urgh, most of these are dependencies of Email::Send, should figure them out automatically. - perlFlags = map (x: "-I${x}/lib/site_perl") [ + perlFlags = map (x: "-I${x}/lib/perl5/site_perl") [ pkgs.perlPackages.BerkeleyDB pkgs.perlPackages.EmailSend pkgs.perlPackages.EmailSimple pkgs.perlPackages.ModulePluggable pkgs.perlPackages.ReturnValue pkgs.perlPackages.EmailAddress