diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/audio')
3 files changed, 94 insertions, 28 deletions
diff --git a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix index 820ea1e49b9e..03048abcc321 100644 --- a/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pulseaudio, rtmidi }: +{ stdenv +, lib +, config +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsaLib +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux +, libpulseaudio +, jackSupport ? true +, jack +, coreaudioSupport ? stdenv.hostPlatform.isDarwin +, CoreAudio +}: stdenv.mkDerivation rec { version = "5.1.0"; @@ -11,22 +26,40 @@ stdenv.mkDerivation rec { sha256 = "1pglnjz907ajlhnlnig3p0sx7hdkpggr8ss7b3wzf1lykzgv9l52"; }; - patches = [ ./rtaudio-pkgconfig.patch ]; + patches = [ + # Fixes missing headers & install location + # Drop with version > 5.1.0 + (fetchpatch { + name = "RtAudio-Adjust-CMake-public-header-installs-to-match-autotools.patch"; + url = "https://github.com/thestk/rtaudio/commit/4273cf7572b8f51b5996cf6b42e3699cc6b165da.patch"; + sha256 = "1p0idll0xsfk3jwjg83jkxkaf20gk0wqa7l982ni389rn6i4n26p"; + }) + ]; - enableParallelBuilding = true; + postPatch = '' + substituteInPlace rtaudio.pc.in \ + --replace 'Requires:' 'Requires.private:' + ''; - buildInputs = [ autoconf automake libtool libjack2 alsaLib pulseaudio rtmidi ]; + nativeBuildInputs = [ cmake pkg-config ]; - preConfigure = '' - ./autogen.sh --no-configure - ./configure - ''; + buildInputs = lib.optional alsaSupport alsaLib + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional jackSupport jack + ++ lib.optional coreaudioSupport CoreAudio; + + cmakeFlags = [ + "-DRTAUDIO_API_ALSA=${if alsaSupport then "ON" else "OFF"}" + "-DRTAUDIO_API_PULSE=${if pulseaudioSupport then "ON" else "OFF"}" + "-DRTAUDIO_API_JACK=${if jackSupport then "ON" else "OFF"}" + "-DRTAUDIO_API_CORE=${if coreaudioSupport then "ON" else "OFF"}" + ]; meta = with lib; { description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; - homepage = "http://www.music.mcgill.ca/~gary/rtaudio/"; + homepage = "https://www.music.mcgill.ca/~gary/rtaudio/"; license = licenses.mit; - maintainers = [ maintainers.magnetophon ]; + maintainers = with maintainers; [ magnetophon ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch deleted file mode 100644 index 8536332d46d7..000000000000 --- a/nixpkgs/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/rtaudio.pc.in -+++ b/rtaudio.pc.in -@@ -9 +9 @@ Version: @PACKAGE_VERSION@ --Requires: @req@ -+Requires.private: @req@ diff --git a/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix index f6208bab6c60..540e152655f6 100644 --- a/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsaLib +, jackSupport ? true +, jack +, coremidiSupport ? stdenv.hostPlatform.isDarwin +, CoreMIDI +, CoreAudio +, CoreServices +}: stdenv.mkDerivation rec { version = "4.0.0"; @@ -11,21 +25,45 @@ stdenv.mkDerivation rec { sha256 = "1g31p6a96djlbk9jh5r4pjly3x76lhccva9hrw6xzdma8dsjzgyq"; }; - enableParallelBuilding = true; + patches = [ + # PR #230, fix CMake problems + (fetchpatch { + name = "RtMidi-Fix-JACK_HAS_PORT_RENAME-define.patch"; + url = "https://github.com/thestk/rtmidi/pull/230/commits/768a30a61b60240b66cc2d43bc27a544ff9f1622.patch"; + sha256 = "1sym4f7nb2qyyxfhi1l0xsm2hfh6gddn81y36qvfq4mcs33vvid0"; + }) + (fetchpatch { + name = "RtMidi-Add-prefix-define-for-pkgconfig.patch"; + url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch"; + sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w"; + }) + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake libtool libjack2 alsaLib ]; - - preConfigure = '' - ./autogen.sh --no-configure - ./configure + postPatch = '' + substituteInPlace rtmidi.pc.in \ + --replace 'Requires:' 'Requires.private:' + substituteInPlace CMakeLists.txt \ + --replace 'PUBLIC_HEADER RtMidi.h' 'PUBLIC_HEADER "RtMidi.h;rtmidi_c.h"' \ + --replace 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}' 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}/rtmidi' ''; - meta = { + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = lib.optional alsaSupport alsaLib + ++ lib.optional jackSupport jack + ++ lib.optionals coremidiSupport [ CoreMIDI CoreAudio CoreServices ]; + + cmakeFlags = [ + "-DRTMIDI_API_ALSA=${if alsaSupport then "ON" else "OFF"}" + "-DRTMIDI_API_JACK=${if jackSupport then "ON" else "OFF"}" + "-DRTMIDI_API_CORE=${if coremidiSupport then "ON" else "OFF"}" + ]; + + meta = with lib; { description = "A set of C++ classes that provide a cross platform API for realtime MIDI input/output"; - homepage = "http://www.music.mcgill.ca/~gary/rtmidi/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = with lib.platforms; linux ++ darwin; + homepage = "https://www.music.mcgill.ca/~gary/rtmidi/"; + license = licenses.mit; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.unix; }; } |