jackmix: Build jackmix in two flavours

Flavours are:
- *jackmix* using jack2 (default)
- *jackmix_jack1* using jack1
This commit is contained in:
Arnold Krille 2015-10-02 14:30:39 +02:00
parent 48f05f7b10
commit 3bce303e05
2 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgs }: { stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jackmix-0.5.2"; name = "jackmix-0.5.2";
@ -11,9 +11,8 @@ stdenv.mkDerivation rec {
pkgs.pkgconfig pkgs.pkgconfig
pkgs.scons pkgs.scons
pkgs.kde4.qt4 pkgs.kde4.qt4
pkgs.jack1
pkgs.lash pkgs.lash
pkgs.libuuid # should be a propagatedBuildInput on jack1 jack
]; ];
buildPhase = '' buildPhase = ''

View File

@ -11803,6 +11803,7 @@ let
jackmeter = callPackage ../applications/audio/jackmeter { }; jackmeter = callPackage ../applications/audio/jackmeter { };
jackmix = callPackage ../applications/audio/jackmix { }; jackmix = callPackage ../applications/audio/jackmix { };
jackmix_jack1 = jackmix.override { jack = jack1; };
jalv = callPackage ../applications/audio/jalv { }; jalv = callPackage ../applications/audio/jalv { };