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

Merge pull request #52568 from Mic92/pypy-fix

Browse Source 
python-wrap: fix for pypy
This commit is contained in:
Jörg Thalheim 2018-12-20 16:24:03 +01:00 committed by GitHub
commit 8fcabc9ee6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/network-filesystems/glusterfs.nix
View File

@ -201,7 +201,6 @@ in
serviceConfig = { serviceConfig = {
Type="simple"; Type="simple";
Environment="PYTHONPATH=${glusterfs}/usr/lib/python2.7/site-packages";
PIDFile="/run/glustereventsd.pid"; PIDFile="/run/glustereventsd.pid";
ExecStart="${glusterfs}/sbin/glustereventsd --pid-file /run/glustereventsd.pid"; ExecStart="${glusterfs}/sbin/glustereventsd --pid-file /run/glustereventsd.pid";
ExecReload="/bin/kill -SIGUSR2 $MAINPID"; ExecReload="/bin/kill -SIGUSR2 $MAINPID";

2
pkgs/development/interpreters/python/wrap-python.nix
View File

@ -7,7 +7,7 @@ with lib;
makeSetupHook { makeSetupHook {
deps = makeWrapper; deps = makeWrapper;
substitutions.libPrefix = python.libPrefix; substitutions.sitePackages = python.sitePackages;
substitutions.executable = python.interpreter; substitutions.executable = python.interpreter;
substitutions.python = python; substitutions.python = python;
substitutions.magicalSedExpression = let substitutions.magicalSedExpression = let

8
pkgs/development/interpreters/python/wrap.sh
View File

@ -92,7 +92,7 @@ _addToPythonPath() {
pythonPathsSeen[$dir]=1 pythonPathsSeen[$dir]=1
# addToSearchPath is defined in stdenv/generic/setup.sh. It will have # addToSearchPath is defined in stdenv/generic/setup.sh. It will have
# the effect of calling `export program_X=$dir/...:$program_X`. # the effect of calling `export program_X=$dir/...:$program_X`.
addToSearchPath program_PYTHONPATH $dir/lib/@libPrefix@/site-packages addToSearchPath program_PYTHONPATH $dir/@sitePackages@
addToSearchPath program_PATH $dir/bin addToSearchPath program_PATH $dir/bin
# Inspect the propagated inputs (if they exist) and recur on them. # Inspect the propagated inputs (if they exist) and recur on them.
@ -113,9 +113,9 @@ createBuildInputsPth() {
if $(echo -n $x |grep -q python-recursive-pth-loader); then if $(echo -n $x |grep -q python-recursive-pth-loader); then
continue continue
fi fi
if test -d "$x"/lib/@libPrefix@/site-packages; then if test -d "$x"/@sitePackages@; then
echo $x/lib/@libPrefix@/site-packages \ echo $x/@sitePackages@ \
>> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth >> "$out"/@sitePackages@/${name}-nix-python-$category.pth
fi fi
done done
fi fi