diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2012-11-24 23:24:22 +0100 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2012-11-24 23:24:34 +0100 |
| commit | 9208fb1edb490a4b4385665446bac42b1de69779 (patch) | |
| tree | b5e6a42c2c5548719090d6561809601d3d9edaab /pkgs/applications/version-management/mercurial | |
| parent | 92a833604c4862420ba1fc480fce70907f5d8539 (diff) | |
| download | nixlib-9208fb1edb490a4b4385665446bac42b1de69779.tar nixlib-9208fb1edb490a4b4385665446bac42b1de69779.tar.gz nixlib-9208fb1edb490a4b4385665446bac42b1de69779.tar.bz2 nixlib-9208fb1edb490a4b4385665446bac42b1de69779.tar.lz nixlib-9208fb1edb490a4b4385665446bac42b1de69779.tar.xz nixlib-9208fb1edb490a4b4385665446bac42b1de69779.tar.zst nixlib-9208fb1edb490a4b4385665446bac42b1de69779.zip | |
fix mercurial -extra PYTHONPATH +setuptools
- PYTHONPATH is already set correctly - setuptools is needed to see docutils
Diffstat (limited to 'pkgs/applications/version-management/mercurial')
| -rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 6 |
1 files 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)"; |