From 004b908ae6ececca2743894e3bf6e69a39e3b684 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 22 Dec 2018 12:47:33 -0800 Subject: [PATCH] pypy, pypy3: Remove wrapper The wrapper is not needed because the runpath is already set correctly, and LD_LIBRARY_PATH was breaking child processes linked against different libc versions. Signed-off-by: Anders Kaseorg --- .../interpreters/python/pypy/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 65cc431c282..193f134e5c6 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchurl , zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 -, makeWrapper, callPackage, self, gdbm, db, lzma +, callPackage, self, gdbm, db, lzma , python-setup-hook # For the Python package set , packageOverrides ? (self: super: {}) @@ -37,7 +37,7 @@ in with passthru; stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db ] ++ optionals isPy3k [ @@ -128,15 +128,6 @@ in with passthru; stdenv.mkDerivation rec { ln -s $out/${executable}/include $out/include/${libPrefix} ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} - # 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/${executable}-c/${executable}-c" \ - --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \ - --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib" - # verify cffi modules $out/bin/${executable} -c ${if isPy3k then "'import tkinter;import sqlite3;import curses;import lzma'" else "'import Tkinter;import sqlite3;import curses'"}