From f2f048db4d6ad640dd2e24a671ae682fb0c94b1b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 6 Oct 2010 12:38:37 +0000
Subject: [PATCH] mercurial/apache: put PYTHONPATH in globalEnvVars

svn path=/nixos/trunk/; revision=24115
---
 modules/services/web-servers/apache-httpd/mercurial.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/services/web-servers/apache-httpd/mercurial.nix b/modules/services/web-servers/apache-httpd/mercurial.nix
index cecc486160be..d2d9e66d4f84 100644
--- a/modules/services/web-servers/apache-httpd/mercurial.nix
+++ b/modules/services/web-servers/apache-httpd/mercurial.nix
@@ -42,7 +42,6 @@ in {
         AllowOverride All
         Options ExecCGI
         AddHandler cgi-script .cgi
-        SetEnv PYTHONPATH "${mercurial}/lib/${pkgs.python.libPrefix}/site-packages"
         PassEnv PYTHONPATH
     </Directory>
   '';
@@ -56,6 +55,8 @@ in {
     (pkgs.python+"/bin")    
   ];
   
+  globalEnvVars = [ { name = "PYTHONPATH"; value = "${mercurial}/lib/${pkgs.python.libPrefix}/site-packages"; } ];
+  
   options = {
     urlPrefix = mkOption {
       default = "/hg";