From 0fe995af20b97c1c71ef92f07cf065a5601958f6 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Wed, 16 Feb 2022 17:12:31 +0800 Subject: [PATCH 1/2] rtmidi-python: fix build on darwin --- .../python-modules/rtmidi-python/default.nix | 19 +++++++++++++++++-- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix index e1565fa6c30c..02bb45fd6bc0 100644 --- a/pkgs/development/python-modules/rtmidi-python/default.nix +++ b/pkgs/development/python-modules/rtmidi-python/default.nix @@ -1,4 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, cython, alsa-lib }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, cython +, alsa-lib +, CoreAudio +, CoreMIDI +, CoreServices +}: buildPythonPackage rec { pname = "rtmidi-python"; @@ -14,7 +23,13 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ cython ]; - buildInputs = [ alsa-lib ]; + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + CoreAudio + CoreMIDI + CoreServices + ]; setupPyBuildFlags = [ "--from-cython" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65704adecf1a..894c218f94be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8777,7 +8777,9 @@ in { rstcheck = callPackage ../development/python-modules/rstcheck { }; - rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices; + }; rtoml = callPackage ../development/python-modules/rtoml { }; From 83fdcef7384a016ac7fbf9e4d41bb7fca85cb514 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Wed, 16 Feb 2022 17:19:37 +0800 Subject: [PATCH 2/2] python-rtmidi: fix build on darwin --- .../python-modules/python-rtmidi/default.nix | 26 ++++++++++++++++--- pkgs/top-level/python-packages.nix | 4 ++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 335a085277a0..58d6a1e72f55 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -1,5 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, pkg-config, alsa-lib, libjack2, tox, flake8, alabaster +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +, pkg-config +, alsa-lib +, libjack2 +, tox +, flake8 +, alabaster +, CoreAudio +, CoreMIDI +, CoreServices }: buildPythonPackage rec { @@ -13,7 +25,15 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib libjack2 ]; + buildInputs = [ + libjack2 + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + CoreAudio + CoreMIDI + CoreServices + ]; checkInputs = [ tox flake8 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 894c218f94be..d64a8e40d718 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8135,7 +8135,9 @@ in { python-registry = callPackage ../development/python-modules/python-registry { }; - python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; + python-rtmidi = callPackage ../development/python-modules/python-rtmidi { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices; + }; python-sat = callPackage ../development/python-modules/python-sat { };