From bb7eb9829df55b7f5298fac91ce04c1400550ed7 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Wed, 30 Sep 2015 14:03:58 +0200 Subject: [PATCH 1/3] jackmix: init at version 0.5.2 Add jackmix to the nix pkgs. --- lib/maintainers.nix | 1 + pkgs/applications/audio/jackmix/default.nix | 36 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/applications/audio/jackmix/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b2bdd2cd15e..071a4d45ba2 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -144,6 +144,7 @@ jwilberding = "Jordan Wilberding "; jzellner = "Jeff Zellner "; kamilchm = "Kamil Chmielewski "; + kampfschlaefer = "Arnold Krille "; khumba = "Bryan Gardiner "; kkallio = "Karn Kallio "; koral = "Koral "; diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix new file mode 100644 index 00000000000..7d840198dc7 --- /dev/null +++ b/pkgs/applications/audio/jackmix/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgs }: + +stdenv.mkDerivation rec { + name = "jackmix-0.5.2"; + src = fetchurl { + url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz; + sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j"; + }; + + buildInputs = [ + pkgs.pkgconfig + pkgs.scons + pkgs.kde4.qt4 + pkgs.jack1 + pkgs.lash + pkgs.libuuid # should be a propagatedBuildInput on jack1 + ]; + + buildPhase = '' + scons + ''; + installPhase = '' + mkdir -p $out/bin + cp jackmix/jackmix $out/bin + ''; + + meta = { + description = "Matrix-Mixer for the Jack-Audio-connection-Kit"; + homepage = http://www.arnoldarts.de/jackmix/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.kampfschlaefer ]; + platforms = stdenv.lib.platforms.linux; + }; +} + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35849cdd9b9..0dcec4870b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11802,6 +11802,8 @@ let jackmeter = callPackage ../applications/audio/jackmeter { }; + jackmix = callPackage ../applications/audio/jackmix { }; + jalv = callPackage ../applications/audio/jalv { }; jedit = callPackage ../applications/editors/jedit { }; From 48f05f7b101e8505c895540c1afca9a3221e4519 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Fri, 2 Oct 2015 14:27:04 +0200 Subject: [PATCH 2/3] jackaudio: Add libuuid as propagatedBuildInput The jack/jack.h includes uuid/uuid.h, therefox libuuid should be a propagated input for anything using jack. --- pkgs/misc/jackaudio/default.nix | 3 ++- pkgs/misc/jackaudio/jack1.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 25fd1a5cbbf..73cb62f3e03 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper -, bash, libsamplerate, libsndfile, readline +, bash, libsamplerate, libsndfile, libuuid, readline # Optional Dependencies , dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { optDbus optPythonDBus optLibffado optAlsaLib optLibopus ]; + propagatedBuildInputs = [ libuuid ]; prePatch = '' substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 1c5c78548f5..4250efcb6a2 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ optAlsaLib optDb optLibuuid optLibffado optCelt ]; + buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; + propagatedBuildInputs = [ optLibuuid ]; meta = with stdenv.lib; { description = "JACK audio connection kit"; From 3bce303e05f3310b19d9f47e9bb5c1ba484ee456 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Fri, 2 Oct 2015 14:30:39 +0200 Subject: [PATCH 3/3] jackmix: Build jackmix in two flavours Flavours are: - *jackmix* using jack2 (default) - *jackmix_jack1* using jack1 --- pkgs/applications/audio/jackmix/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 7d840198dc7..8176a340470 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs }: +{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }: stdenv.mkDerivation rec { name = "jackmix-0.5.2"; @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { pkgs.pkgconfig pkgs.scons pkgs.kde4.qt4 - pkgs.jack1 pkgs.lash - pkgs.libuuid # should be a propagatedBuildInput on jack1 + jack ]; buildPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dcec4870b1..9d77849bbb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11803,6 +11803,7 @@ let jackmeter = callPackage ../applications/audio/jackmeter { }; jackmix = callPackage ../applications/audio/jackmix { }; + jackmix_jack1 = jackmix.override { jack = jack1; }; jalv = callPackage ../applications/audio/jalv { };