summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/audio/jackmix/default.nix5
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 3 insertions, 3 deletions
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 { };