From 707c48c1b3c02252bbf739232d10ae97d1ca9361 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 20 Apr 2025 01:17:32 +0200 Subject: [PATCH] python312Packages.awscrt: refactor --- pkgs/development/python-modules/awscrt/default.nix | 12 ++++-------- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index dc09c49df9b2..c152cbd54490 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -2,30 +2,26 @@ lib, buildPythonPackage, fetchPypi, + setuptools, cmake, perl, stdenv, - CoreFoundation, - Security, pythonOlder, }: buildPythonPackage rec { pname = "awscrt"; version = "0.26.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-qNY6fcxkhMXBZ1sxqNG2cmw9yFsTeW+xQ9+wByJgk14="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - ]; + build-system = [ setuptools ]; nativeBuildInputs = [ cmake ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ perl ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a6a77d1ea23..35f4f28d425f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1197,9 +1197,7 @@ self: super: with self; { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; - awscrt = callPackage ../development/python-modules/awscrt { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; - }; + awscrt = callPackage ../development/python-modules/awscrt { }; awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { };