pypy: fix darwin build after sdk rework
https://hydra.nixos.org/build/276111920/nixlog/6/tail
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user