Merge pull request #209597 from wegank/pypy27-darwin
pythonInterpreters.pypy27_prebuilt: fix install check on darwin
This commit is contained in:
commit
2a19c135fc
|
@ -12,6 +12,8 @@
|
||||||
, sqlite
|
, sqlite
|
||||||
, tcl-8_5
|
, tcl-8_5
|
||||||
, tk-8_5
|
, tk-8_5
|
||||||
|
, tcl-8_6
|
||||||
|
, tk-8_6
|
||||||
, zlib
|
, zlib
|
||||||
# For the Python package set
|
# For the Python package set
|
||||||
, packageOverrides ? (self: super: {})
|
, packageOverrides ? (self: super: {})
|
||||||
|
@ -69,9 +71,13 @@ in with passthru; stdenv.mkDerivation {
|
||||||
gdbm
|
gdbm
|
||||||
ncurses6
|
ncurses6
|
||||||
sqlite
|
sqlite
|
||||||
|
zlib
|
||||||
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
tcl-8_5
|
tcl-8_5
|
||||||
tk-8_5
|
tk-8_5
|
||||||
zlib
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
tcl-8_6
|
||||||
|
tk-8_6
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||||
|
@ -108,10 +114,19 @@ in with passthru; stdenv.mkDerivation {
|
||||||
@rpath/lib${executable}-c.dylib \
|
@rpath/lib${executable}-c.dylib \
|
||||||
$out/lib/lib${executable}-c.dylib \
|
$out/lib/lib${executable}-c.dylib \
|
||||||
$out/bin/${executable}
|
$out/bin/${executable}
|
||||||
|
install_name_tool \
|
||||||
|
-change \
|
||||||
|
/opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \
|
||||||
|
${tcl-8_6}/lib/libtcl8.6.dylib \
|
||||||
|
$out/lib_pypy/_tkinter/*.so
|
||||||
|
install_name_tool \
|
||||||
|
-change \
|
||||||
|
/opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \
|
||||||
|
${tk-8_6}/lib/libtk8.6.dylib \
|
||||||
|
$out/lib_pypy/_tkinter/*.so
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Native libraries are not working in darwin
|
doInstallCheck = true;
|
||||||
doInstallCheck = !stdenv.isDarwin;
|
|
||||||
|
|
||||||
# Check whether importing of (extension) modules functions
|
# Check whether importing of (extension) modules functions
|
||||||
installCheckPhase = let
|
installCheckPhase = let
|
||||||
|
|
Loading…
Reference in a new issue