nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 11:22:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix mercurial -extra PYTHONPATH +setuptools

Browse Source 
- PYTHONPATH is already set correctly
- setuptools is needed to see docutils
This commit is contained in:
Florian Friesdorf 2012-11-24 23:24:22 +01:00
parent 92a833604c
commit 9208fb1edb
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/version-management/mercurial/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, makeWrapper, docutils, unzip { stdenv, fetchurl, python, makeWrapper, docutils, setuptools, unzip
, guiSupport ? false, tk ? null, curses }: , guiSupport ? false, tk ? null, curses }:
let let
@ -15,9 +15,7 @@ stdenv.mkDerivation {
inherit python; # pass it so that the same version can be used in hg2git inherit python; # pass it so that the same version can be used in hg2git
pythonPackages = [ curses ]; pythonPackages = [ curses ];
buildInputs = [ python makeWrapper docutils unzip ]; buildInputs = [ python makeWrapper docutils setuptools 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";
makeFlags = "PREFIX=$(out)"; makeFlags = "PREFIX=$(out)";