From dcbf69915d73d4e2192e8df188014564dd6a9eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 28 Dec 2013 21:04:31 +0100 Subject: [PATCH] matplotlib: get rid of distribute --- pkgs/top-level/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d7f1732eab5..f61fd15beaab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3451,6 +3451,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { then pkgs.clangStdenv else pkgs.stdenv; + # TODO: refactor to use pythonBuildPackage matplotlib = matplotlibStdenv.mkDerivation (rec { name = "matplotlib-1.3.1"; @@ -3462,13 +3463,16 @@ pythonPackages = modules // import ./python-packages-generated.nix { # error: invalid command 'test' doCheck = false; - buildInputs = [ python pkgs.which pkgs.ghostscript distribute ]; + buildInputs = [ python pkgs.which pkgs.ghostscript ]; propagatedBuildInputs = [ dateutil nose numpy pyparsing tornado pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ]; - buildPhase = "${python}/bin/${python.executable} setup.py build"; + buildPhase = '' + sed -i '/use_setuptools/d' setup.py + ${python}/bin/${python.executable} setup.py build + ''; # The sed expression parses out the python version from an executable with appended characters installPhase = ''