Merge remote-tracking branch 'origin/master' into hardened-stdenv

4 files changed, 80 insertions, 1 deletions

diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix
new file mode 100644
index 000000000000..a3d04fee7f64
--- /dev/null
+++ b/pkgs/development/libraries/audio/jamomacore/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, pkgconfig, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2,  ninja }:
+
+stdenv.mkDerivation rec {
+  version = "1.0-beta.1";
+  name = "JamomaCore-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jamoma";
+    repo = "JamomaCore";
+    rev = "v${version}";
+    sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln";
+  };
+
+  buildInputs = [ pkgconfig alsaLib portaudio portmidi libsndfile cmake libxml2  ninja ];
+
+  meta = {
+    description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media";
+    homepage = https://jamoma.org;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index 401743ac517f..a56425b8425b 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     python waf configure --prefix=$out \
       --boost-includes="${boost.dev}/include" \
-      --boost-libs="${boost.lib}/lib"
+      --boost-libs="${boost.out}/lib"
   '';
 
   buildPhase = "python waf";
diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
new file mode 100644
index 000000000000..326572996b48
--- /dev/null
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2,  alsaLib, rtmidi }:
+
+stdenv.mkDerivation rec {
+  version = "4.1.2";
+  name = "rtaudio-${version}";
+
+  src = fetchFromGitHub {
+    owner = "thestk";
+    repo = "rtaudio";
+    rev = "${version}";
+    sha256 = "09j84l9l3q0g238z5k89rm8hgk0i1ir8917an7amq474nwjp80pq";
+  };
+
+  buildInputs = [ autoconf automake libtool libjack2 alsaLib rtmidi ];
+
+  preConfigure = ''
+    ./autogen.sh --no-configure
+    ./configure
+  '';
+
+  meta = {
+    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/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix
new file mode 100644
index 000000000000..b41db495dbae
--- /dev/null
+++ b/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "2.1.1";
+  name = "rtmidi-${version}";
+
+  src = fetchFromGitHub {
+    owner = "thestk";
+    repo = "rtmidi";
+    rev = "${version}";
+    sha256 = "11pl45lp8sq5xkpipwk622w508nw0qcxr03ibicqn1lsws0hva96";
+  };
+
+  buildInputs = [ autoconf automake libtool libjack2 alsaLib pkgconfig ];
+
+  preConfigure = ''
+    ./autogen.sh --no-configure
+    ./configure
+  '';
+
+  meta = {
+    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 = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}