From 997a09e6124f7a8a61f0dd138d64ecc9c15beff4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 6 Jan 2023 15:59:26 +0000 Subject: [PATCH] pypy39: fix build in darwin --- pkgs/development/interpreters/python/pypy/default.nix | 2 +- pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 3004ebc1f751..b2b7d0baa53e 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -156,7 +156,7 @@ in with passthru; stdenv.mkDerivation rec { ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} ${lib.optionalString stdenv.isDarwin '' - install_name_tool -change @rpath/libpypy${optionalString isPy3k "3"}-c.dylib $out/lib/libpypy${optionalString isPy3k "3"}-c.dylib $out/bin/${executable} + install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable} ''} # verify cffi modules diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index babaf3fd0a47..444d43309511 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -105,8 +105,8 @@ in with passthru; stdenv.mkDerivation { '' + lib.optionalString (stdenv.isDarwin) '' install_name_tool \ -change \ - @rpath/libpypy${optionalString isPy3k "3"}-c.dylib \ - $out/lib/libpypy${optionalString isPy3k "3"}-c.dylib \ + @rpath/lib${executable}-c.dylib \ + $out/lib/lib${executable}-c.dylib \ $out/bin/${executable} '';