fix mercurial -extra PYTHONPATH +setuptools

- PYTHONPATH is already set correctly
- setuptools is needed to see docutils
wip/yesman
Florian Friesdorf 12 years ago
parent 92a833604c
commit 9208fb1edb
  1. 6
      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)";

Loading…
Cancel
Save