pypy: fix darwin build after sdk rework

https://hydra.nixos.org/build/276111920/nixlog/6/tail
This commit is contained in:
Olivér Falvai
2024-10-28 08:12:22 +01:00
parent 4586c4a5ed
commit e6b926034f
2 changed files with 2 additions and 6 deletions
@@ -135,8 +135,6 @@ in {
db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
python = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
inherit passthruFun;
inherit (darwin) libunwind;
inherit (darwin.apple_sdk.frameworks) Security;
};
pypy39 = callPackage ./pypy {
@@ -152,8 +150,6 @@ in {
db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
python = __splicedPackages.pypy27;
inherit passthruFun;
inherit (darwin) libunwind;
inherit (darwin.apple_sdk.frameworks) Security;
};
pypy310 = __splicedPackages.pypy39.override {
@@ -1,6 +1,6 @@
{ lib, stdenv, substituteAll, fetchurl
, zlibSupport ? true, zlib
, bzip2, pkg-config, libffi, libunwind, Security
, bzip2, pkg-config, libffi, darwin
, sqlite, openssl, ncurses, python, expat, tcl, tk, tclPackages, libX11
, gdbm, db, xz, python-setup-hook
, optimizationLevel ? "jit", boehmgc
@@ -64,7 +64,7 @@ in with passthru; stdenv.mkDerivation rec {
] ++ lib.optionals (lib.any (l: l == optimizationLevel) [ "0" "1" "2" "3"]) [
boehmgc
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
libunwind Security
darwin.libutil
];
# Remove bootstrap python from closure