From 9208fb1edb490a4b4385665446bac42b1de69779 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 24 Nov 2012 23:24:22 +0100
Subject: [PATCH] fix mercurial -extra PYTHONPATH +setuptools

- PYTHONPATH is already set correctly
- setuptools is needed to see docutils
---
 pkgs/applications/version-management/mercurial/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 486bebc2531c..afbfc1c8935b 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, makeWrapper, docutils, unzip
+{ stdenv, fetchurl, python, makeWrapper, docutils, setuptools, unzip
 , guiSupport ? false, tk ? null, curses }:
 
 let
@@ -15,9 +15,7 @@ stdenv.mkDerivation {
   inherit python; # pass it so that the same version can be used in hg2git
   pythonPackages = [ curses ];
 
-  buildInputs = [ python makeWrapper docutils unzip ];
-
-  PYTHONPATH = "${python}/lib/python2.6/site-packages:${python}/lib/python2.7/site-packages:${docutils}/lib/python2.5/site-packages:${docutils}/lib/python2.6/site-packages:${docutils}/lib/python2.7/site-packages";
+  buildInputs = [ python makeWrapper docutils setuptools unzip ];
 
   makeFlags = "PREFIX=$(out)";