From 48368865bcc908bbb39bf298d31fae8fe2ee9b30 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 30 Mar 2024 02:03:26 +0000 Subject: [PATCH 1/2] python3Packages.rerun-sdk: fix -liconv on darwin Cf. https://hydra.nixos.org/build/254442092/nixlog/1 --- pkgs/development/python-modules/rerun-sdk/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index 6ab9c8a758a0..30cba3cd700d 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -12,6 +12,7 @@ typing-extensions, pytestCheckHook, python, + libiconv, }: buildPythonPackage { @@ -27,6 +28,10 @@ buildPythonPackage { rustPlatform.maturinBuildHook ]; + buildInputs = [ + libiconv # No-op on Linux, necessary on Darwin. + ]; + propagatedBuildInputs = [ attrs numpy From b646f53a2401dff9e51eb33df4ed233fae802c42 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 30 Mar 2024 22:25:02 +0000 Subject: [PATCH 2/2] python3Packages.rerun-sdk: add missing darwin frameworks Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/development/python-modules/rerun-sdk/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index 30cba3cd700d..f6476b1675bd 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -4,6 +4,7 @@ rustPlatform, stdenv, attrs, + darwin, numpy, pillow, pyarrow, @@ -30,6 +31,9 @@ buildPythonPackage { buildInputs = [ libiconv # No-op on Linux, necessary on Darwin. + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreServices ]; propagatedBuildInputs = [