diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-28 17:55:20 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-28 17:55:20 -0700 |
| commit | 5ca1c32a9d3705b36caef94bd8a8628a81c2d210 (patch) | |
| tree | 0baaad6405c8483726accb0b28c7aa5ffbea068b /pkgs/development/interpreters | |
| parent | 28a18999faeab25b92649027f4411e7f41d793da (diff) | |
| parent | d2dce19793069b6104ff7df29af92316e7fe3b50 (diff) | |
| download | nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.gz nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.bz2 nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.lz nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.xz nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.zst nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/pypy/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index a4eb7439b0d5..f5cf11ead970 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -100,7 +100,12 @@ let ln -s $out/pypy-c/include $out/include/${libPrefix} ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} - wrapProgram "$out/bin/pypy" \ + # We must wrap the original, not the symlink. + # PyPy uses argv[0] to find its standard library, and while it knows + # how to follow symlinks, it doesn't know about wrappers. So, it + # will think the wrapper is the original. As long as the wrapper has + # the same path as the original, this is OK. + wrapProgram "$out/pypy-c/pypy-c" \ --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \ --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib" |