From 3bce303e05f3310b19d9f47e9bb5c1ba484ee456 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Fri, 2 Oct 2015 14:30:39 +0200 Subject: 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(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 7d840198dc7c..8176a3404702 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 0dcec4870b18..9d77849bbb77 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 { }; -- cgit 1.4.1