diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-12-20 14:03:23 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-12-20 14:18:25 +0000 |
| commit | 855777ad22e056557d8e8a8c71aebb156f21a711 (patch) | |
| tree | f356fb465a7623d09326362c76f7cf68e1f6cf12 /pkgs/development/interpreters | |
| parent | cc30e486246c5e399d812e87e7f6c2fc38760d74 (diff) | |
| download | nixlib-855777ad22e056557d8e8a8c71aebb156f21a711.tar nixlib-855777ad22e056557d8e8a8c71aebb156f21a711.tar.gz nixlib-855777ad22e056557d8e8a8c71aebb156f21a711.tar.bz2 nixlib-855777ad22e056557d8e8a8c71aebb156f21a711.tar.lz nixlib-855777ad22e056557d8e8a8c71aebb156f21a711.tar.xz nixlib-855777ad22e056557d8e8a8c71aebb156f21a711.tar.zst nixlib-855777ad22e056557d8e8a8c71aebb156f21a711.zip | |
wrap-python: fix pypy site-packages path
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/wrap-python.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/wrap.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/python/wrap-python.nix b/pkgs/development/interpreters/python/wrap-python.nix index 1efd777bb052..4ff0a62d7fbd 100644 --- a/pkgs/development/interpreters/python/wrap-python.nix +++ b/pkgs/development/interpreters/python/wrap-python.nix @@ -7,7 +7,7 @@ with lib; makeSetupHook { deps = makeWrapper; - substitutions.libPrefix = python.libPrefix; + substitutions.sitePackages = python.sitePackages; substitutions.executable = python.interpreter; substitutions.python = python; substitutions.magicalSedExpression = let diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 01b573e6ad5d..6fa8c316a17d 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -92,7 +92,7 @@ _addToPythonPath() { pythonPathsSeen[$dir]=1 # addToSearchPath is defined in stdenv/generic/setup.sh. It will have # 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 # 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 continue fi - if test -d "$x"/lib/@libPrefix@/site-packages; then - echo $x/lib/@libPrefix@/site-packages \ - >> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth + if test -d "$x"/@sitePackages@; then + echo $x/@sitePackages@ \ + >> "$out"/@sitePackages@/${name}-nix-python-$category.pth fi done fi |