From a01d7d131edb31513123eaa0def8fb8abca60430 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 31 Oct 2016 16:54:00 +0100
Subject: [PATCH] mercurial: use mkPythonDerivation

since we don't want to use `--prefix PYTHONPATH` since it leaks
PYTHONPATH.
---
 .../version-management/mercurial/default.nix          | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 026d1b9f983..034eb534423 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -7,9 +7,7 @@ let
   version = "3.9.2";
   name = "mercurial-${version}";
   inherit (python2Packages) docutils hg-git dulwich python;
-in
-
-stdenv.mkDerivation {
+in python2Packages.mkPythonDerivation {
   inherit name;
 
   src = fetchurl {
@@ -19,10 +17,10 @@ stdenv.mkDerivation {
 
   inherit python; # pass it so that the same version can be used in hg2git
 
-  buildInputs = [ python makeWrapper docutils unzip ];
+  buildInputs = [ makeWrapper docutils unzip ];
 
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin
-    [ ApplicationServices cf-private ];
+  propagatedBuildInputs = [ hg-git dulwich ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices cf-private ];
 
   makeFlags = "PREFIX=$(out)";
 
@@ -42,7 +40,6 @@ stdenv.mkDerivation {
     ''
       for i in $(cd $out/bin && ls); do
         wrapProgram $out/bin/$i \
-          --prefix PYTHONPATH : "$(toPythonPath "$out ${hg-git}"):$(toPythonPath "$out ${dulwich}")" \
           $WRAP_TK
       done