Merge pull request #209699 from wegank/pypy27-darwin

pypy27, pypy39: unbreak on aarch64-darwin
This commit is contained in:
Thiago Kenji Okada 2023-01-08 18:38:50 +00:00 committed by GitHub
commit 7b71b0253f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -158,6 +158,11 @@ in with passthru; stdenv.mkDerivation rec {
${lib.optionalString stdenv.isDarwin '' ${lib.optionalString stdenv.isDarwin ''
install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable} install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable}
''} ''}
${lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
mkdir -p $out/${executable}-c/pypy/bin
mv $out/bin/${executable} $out/${executable}-c/pypy/bin/${executable}
ln -s $out/${executable}-c/pypy/bin/${executable} $out/bin/${executable}
''}
# verify cffi modules # 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'"} $out/bin/${executable} -c ${if isPy3k then "'import tkinter;import sqlite3;import curses;import lzma'" else "'import Tkinter;import sqlite3;import curses'"}
@ -174,7 +179,6 @@ in with passthru; stdenv.mkDerivation rec {
description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
license = licenses.mit; license = licenses.mit;
platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
broken = stdenv.isDarwin && stdenv.isAarch64;
maintainers = with maintainers; [ andersk ]; maintainers = with maintainers; [ andersk ];
}; };
} }