From e6b926034f2ab3e994bd382098e7d84e31fbe0ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Mon, 28 Oct 2024 08:12:22 +0100 Subject: [PATCH] pypy: fix darwin build after sdk rework https://hydra.nixos.org/build/276111920/nixlog/6/tail --- pkgs/development/interpreters/python/default.nix | 4 ---- pkgs/development/interpreters/python/pypy/default.nix | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 5e67c8bd4a15..5fd049a9e964 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -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 { diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 4e8199af56b3..b850c79be87a 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -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