Unverified Commit 7a73a0da authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #160302 from azuwis/rtmidi

parents 6335f759 83fdcef7

pkgs/development/python-modules/python-rtmidi/default.nix

+23 −3
Original line number Diff line number Diff line 
{ 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

pkgs/development/python-modules/rtmidi-python/default.nix

+17 −2
Original line number Diff line number Diff line 
{ 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" ];

pkgs/top-level/python-packages.nix

+6 −2
Original line number Diff line number Diff line
@@ -8169,7 +8169,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 { };
@@ -8815,7 +8817,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 { };