From 5a16c0e6e4a547c7bdc99f8534b2e643744e0281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 15 Nov 2015 13:49:20 +0100 Subject: [PATCH] buildPythonPackage: clean up shellHook --- pkgs/development/python-modules/generic/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 55a8c14cd26..c9c03c52cb9 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -162,15 +162,14 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { ''; shellHook = attrs.shellHook or '' + ${preShellHook} if test -e setup.py; then - tmp_path=/tmp/`pwd | md5sum | cut -f 1 -d " "`-$name - mkdir -p $tmp_path/lib/${python.libPrefix}/site-packages - ${preShellHook} + tmp_path=$(mktemp -d) export PATH="$tmp_path/bin:$PATH" - export PYTHONPATH="$tmp_path/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ${python}/bin/${python.executable} setup.py develop --prefix $tmp_path - ${postShellHook} + export PYTHONPATH="$tmp_path/${python.sitePackages}:$PYTHONPATH" + ${python.interpreter} setup.py develop --prefix $tmp_path fi + ${postShellHook} ''; meta = with lib.maintainers; {