From d0809c2925f418119e55fef477ad4b85c9e13c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 18 Nov 2015 11:46:34 +0100 Subject: [PATCH] setuptools: cleanup expression --- .../python-modules/setuptools/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index dc1db1405db..082a16056fd 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, wrapPython, distutils-cfg }: +{ stdenv, fetchurl, python, wrapPython }: stdenv.mkDerivation rec { shortName = "setuptools-${version}"; @@ -11,23 +11,14 @@ stdenv.mkDerivation rec { sha256 = "07avbdc26yl2a46s76fc7m4vg611g8sh39l26x9dr9byya6sb509"; }; - buildInputs = [ python wrapPython distutils-cfg ]; - - buildPhase = "${python}/bin/${python.executable} setup.py build"; - - installPhase = - '' - dst=$out/lib/${python.libPrefix}/site-packages + buildInputs = [ python wrapPython ]; + doCheck = false; # requires pytest + installPhase = '' + dst=$out/${python.sitePackages} mkdir -p $dst export PYTHONPATH="$dst:$PYTHONPATH" - ${python}/bin/${python.executable} setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages + ${python.interpreter} setup.py install --prefix=$out wrapPythonPrograms - ''; - - doCheck = false; # requires pytest - - checkPhase = '' - ${python}/bin/${python.executable} setup.py test ''; meta = with stdenv.lib; {