JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pypy: use the official sitePackages install path

Browse Source
This commit is contained in:
Domen Kožar 2015-11-17 11:36:32 +01:00
parent d748ac851c
commit fc2874d02e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/pypy/default.nix
View File

@ -119,7 +119,7 @@ let
isPypy = true; isPypy = true;
buildEnv = callPackage ../python/wrapper.nix { python = self; }; buildEnv = callPackage ../python/wrapper.nix { python = self; };
interpreter = "${self}/bin/${executable}"; interpreter = "${self}/bin/${executable}";
sitePackages = "lib/${libPrefix}/site-packages"; sitePackages = "site-packages";
}; };
enableParallelBuilding = true; # almost no parallelization without STM enableParallelBuilding = true; # almost no parallelization without STM

4
pkgs/development/interpreters/pypy/setup-hook.sh
View File

@ -1,12 +1,12 @@
addPythonPath() { addPythonPath() {
addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.6/site-packages addToSearchPathWithCustomDelimiter : PYTHONPATH $1/site-packages
} }
toPythonPath() { toPythonPath() {
local paths="$1" local paths="$1"
local result= local result=
for i in $paths; do for i in $paths; do
p="$i/lib/pypy2.6/site-packages" p="$i/site-packages"
result="${result}${result:+:}$p" result="${result}${result:+:}$p"
done done
echo $result echo $result