lol

Merge pull request #160302 from azuwis/rtmidi

authored by

Sandro and committed by
GitHub
7a73a0da 6335f759

+46 -7
+23 -3
pkgs/development/python-modules/python-rtmidi/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi, isPy27 2 - , pkg-config, alsa-lib, libjack2, tox, flake8, alabaster 1 + { lib 2 + , stdenv 3 + , buildPythonPackage 4 + , fetchPypi 5 + , isPy27 6 + , pkg-config 7 + , alsa-lib 8 + , libjack2 9 + , tox 10 + , flake8 11 + , alabaster 12 + , CoreAudio 13 + , CoreMIDI 14 + , CoreServices 3 15 }: 4 16 5 17 buildPythonPackage rec { ··· 13 25 }; 14 26 15 27 nativeBuildInputs = [ pkg-config ]; 16 - buildInputs = [ alsa-lib libjack2 ]; 28 + buildInputs = [ 29 + libjack2 30 + ] ++ lib.optionals stdenv.isLinux [ 31 + alsa-lib 32 + ] ++ lib.optionals stdenv.isDarwin [ 33 + CoreAudio 34 + CoreMIDI 35 + CoreServices 36 + ]; 17 37 checkInputs = [ 18 38 tox 19 39 flake8
+17 -2
pkgs/development/python-modules/rtmidi-python/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi, cython, alsa-lib }: 1 + { lib 2 + , stdenv 3 + , buildPythonPackage 4 + , fetchPypi 5 + , cython 6 + , alsa-lib 7 + , CoreAudio 8 + , CoreMIDI 9 + , CoreServices 10 + }: 2 11 3 12 buildPythonPackage rec { 4 13 pname = "rtmidi-python"; ··· 14 23 ''; 15 24 16 25 nativeBuildInputs = [ cython ]; 17 - buildInputs = [ alsa-lib ]; 26 + buildInputs = lib.optionals stdenv.isLinux [ 27 + alsa-lib 28 + ] ++ lib.optionals stdenv.isDarwin [ 29 + CoreAudio 30 + CoreMIDI 31 + CoreServices 32 + ]; 18 33 19 34 setupPyBuildFlags = [ "--from-cython" ]; 20 35
+6 -2
pkgs/top-level/python-packages.nix
··· 8169 8169 8170 8170 python-registry = callPackage ../development/python-modules/python-registry { }; 8171 8171 8172 - python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; 8172 + python-rtmidi = callPackage ../development/python-modules/python-rtmidi { 8173 + inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices; 8174 + }; 8173 8175 8174 8176 python-sat = callPackage ../development/python-modules/python-sat { }; 8175 8177 ··· 8815 8817 8816 8818 rstcheck = callPackage ../development/python-modules/rstcheck { }; 8817 8819 8818 - rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; 8820 + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { 8821 + inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices; 8822 + }; 8819 8823 8820 8824 rtoml = callPackage ../development/python-modules/rtoml { }; 8821 8825