a package does not need to include setuptools manually

this breaks for now
wip/yesman
Florian Friesdorf 12 years ago
parent 3438681d80
commit 5436356733
  1. 2
      pkgs/applications/misc/calibre/default.nix
  2. 2
      pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
  3. 4
      pkgs/applications/version-management/mercurial/default.nix

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
fontconfig podofo qt4 pil chmlib icu
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
pythonPackages.cssutils pythonPackages.beautifulsoup
pythonPackages.setuptools pythonPackages.sqlite3 sqlite
pythonPackages.sqlite3 sqlite
];
installPhase = ''

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = with pythonPackages;
[
python twisted urwid beautifulsoup wxPython distribute pygobject
wokkel pythonDBus pyfeed pythonPackages.setuptools wrapPython
wokkel pythonDBus pyfeed wrapPython
];
configurePhase = ''

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

Loading…
Cancel
Save