forked from mirrors/nixpkgs
pypy: use the official sitePackages install path
This commit is contained in:
parent
d748ac851c
commit
fc2874d02e
|
@ -119,7 +119,7 @@ let
|
|||
isPypy = true;
|
||||
buildEnv = callPackage ../python/wrapper.nix { python = self; };
|
||||
interpreter = "${self}/bin/${executable}";
|
||||
sitePackages = "lib/${libPrefix}/site-packages";
|
||||
sitePackages = "site-packages";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true; # almost no parallelization without STM
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
addPythonPath() {
|
||||
addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.6/site-packages
|
||||
addToSearchPathWithCustomDelimiter : PYTHONPATH $1/site-packages
|
||||
}
|
||||
|
||||
toPythonPath() {
|
||||
local paths="$1"
|
||||
local result=
|
||||
for i in $paths; do
|
||||
p="$i/lib/pypy2.6/site-packages"
|
||||
p="$i/site-packages"
|
||||
result="${result}${result:+:}$p"
|
||||
done
|
||||
echo $result
|
||||
|
|
Loading…
Reference in a new issue