jackmix: Build jackmix in two flavours

Flavours are:
- *jackmix* using jack2 (default)
- *jackmix_jack1* using jack1

+3 -3
+2 -3
pkgs/applications/audio/jackmix/default.nix
··· 1 - { stdenv, fetchurl, pkgs }: 1 + { stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "jackmix-0.5.2"; ··· 11 11 pkgs.pkgconfig 12 12 pkgs.scons 13 13 pkgs.kde4.qt4 14 - pkgs.jack1 15 14 pkgs.lash 16 - pkgs.libuuid # should be a propagatedBuildInput on jack1 15 + jack 17 16 ]; 18 17 19 18 buildPhase = ''
+1
pkgs/top-level/all-packages.nix
··· 11803 11803 jackmeter = callPackage ../applications/audio/jackmeter { }; 11804 11804 11805 11805 jackmix = callPackage ../applications/audio/jackmix { }; 11806 + jackmix_jack1 = jackmix.override { jack = jack1; }; 11806 11807 11807 11808 jalv = callPackage ../applications/audio/jalv { }; 11808 11809