From acd2064859d4135ee937376a03de574405abc2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 9 Mar 2014 18:00:52 +0100 Subject: [PATCH 1/5] Add raul: A C++ utility library primarily aimed at audio/musical applications --- .../libraries/audio/raul/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/audio/raul/default.nix diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix new file mode 100644 index 00000000000..0ec37a15871 --- /dev/null +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, boost, gtk, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "raul-${version}"; + version = "0.8.0"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "09ms40xc1x6qli6lxkwn5ibqh62nl9w7dq0b6jh1q2zvnrxwsd8b"; + }; + + buildInputs = [ boost gtk pkgconfig python ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "A C++ utility library primarily aimed at audio/musical applications"; + homepage = http://drobilla.net/software/raul; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cd584e6f1f..31d02956a52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5521,6 +5521,8 @@ let rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; + raul = callPackage ../development/libraries/audio/raul { }; + readline = readline6; readline4 = callPackage ../development/libraries/readline/readline4.nix { }; From f6104c88828ff2aa714d8c36f2af1f15c34dafd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 9 Mar 2014 18:20:45 +0100 Subject: [PATCH 2/5] add ganv: An interactive Gtk canvas widget for graph-based interfaces --- pkgs/development/libraries/ganv/default.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/ganv/default.nix diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix new file mode 100644 index 00000000000..e2c5ce47612 --- /dev/null +++ b/pkgs/development/libraries/ganv/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchsvn, graphviz, gtk, gtkmm, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "ganv-svn-${rev}"; + rev = "5318"; + + src = fetchsvn { + url = "http://svn.drobilla.net/lad/trunk/ganv"; + rev = rev; + sha256 = "0wi87ks2xjma979d9hy82wmlm06g4sr0pm3b1n3zv27y52wrf7fl"; + }; + + buildInputs = [ graphviz gtk gtkmm pkgconfig python ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "An interactive Gtk canvas widget for graph-based interfaces"; + homepage = http://drobilla.net; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31d02956a52..b1ed7bb4df0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4161,6 +4161,8 @@ let gamin = callPackage ../development/libraries/gamin { }; + ganv = callPackage ../development/libraries/ganv { }; + gav = callPackage ../games/gav { }; gsb = callPackage ../games/gsb { }; From 061b489f100b6fd3eb2cd50a11856880835b24a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 9 Mar 2014 20:16:47 +0100 Subject: [PATCH 3/5] raul: update to svn version, 0.8.5+ is required by ingen --- pkgs/development/libraries/audio/raul/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 0ec37a15871..a40bb0bf263 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, boost, gtk, pkgconfig, python }: +{ stdenv, fetchsvn, boost, gtk, pkgconfig, python }: stdenv.mkDerivation rec { - name = "raul-${version}"; - version = "0.8.0"; + name = "raul-svn-${rev}"; + rev = "5205"; - src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "09ms40xc1x6qli6lxkwn5ibqh62nl9w7dq0b6jh1q2zvnrxwsd8b"; + src = fetchsvn { + url = "http://svn.drobilla.net/lad/trunk/raul"; + rev = rev; + sha256 = "1rkl7vxhwf6d0qfl2ymfd1qwmh9cl1xv6kkz893xg0blpvzcdmp3"; }; buildInputs = [ boost gtk pkgconfig python ]; From d21323cbf89ef27ee52b85d5eaa3eacaaed2cc98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 9 Mar 2014 20:32:06 +0100 Subject: [PATCH 4/5] add ingen: A modular audio processing system using JACK and LV2 or LADSPA --- pkgs/applications/audio/ingen/default.nix | 33 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/audio/ingen/default.nix diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix new file mode 100644 index 00000000000..73138cc269d --- /dev/null +++ b/pkgs/applications/audio/ingen/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jackaudio, lilv +, lv2, pkgconfig, python, raul, serd, sord, sratom, suil +}: + +stdenv.mkDerivation rec { + name = "ingen-svn-${rev}"; + rev = "5317"; + + src = fetchsvn { + url = "http://svn.drobilla.net/lad/trunk/ingen"; + rev = rev; + sha256 = "0zm3wbv9qsingjyr95nwin3khmnf3wq3fz2xa6p420dpcy6qnl4x"; + }; + + buildInputs = [ + boost ganv glibmm gtk gtkmm jackaudio lilv lv2 pkgconfig python + raul serd sord sratom suil + ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "A modular audio processing system using JACK and LV2 or LADSPA plugins"; + homepage = http://drobilla.net/software/ingen; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1ed7bb4df0..c22f79f0227 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9444,6 +9444,8 @@ let icbm3d = callPackage ../games/icbm3d { }; + ingen = callPackage ../applications/audio/ingen { }; + instead = callPackage ../games/instead { lua = lua5; }; From 13278f2596c19748b4320fe6b7623fcbf7bbb287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 9 Mar 2014 20:33:35 +0100 Subject: [PATCH 5/5] ganv and raul: set linux as a platform --- pkgs/development/libraries/audio/raul/default.nix | 1 + pkgs/development/libraries/ganv/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index a40bb0bf263..aad3656cde8 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = http://drobilla.net/software/raul; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index e2c5ce47612..40e0388d749 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = http://drobilla.net; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; }