summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Brouns <bart@magnetophon.nl>2017-07-25 17:54:24 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2017-07-29 15:49:41 +0200
commit72e99b69154b1c8d50b109237461e480cfeb40ce (patch)
tree0c9e0b29f0a582c5f3ae81f7be6702554f426b64
parenta444b34b52b13b1658875633f871b96456b1cd71 (diff)
downloadnixlib-72e99b69154b1c8d50b109237461e480cfeb40ce.tar
nixlib-72e99b69154b1c8d50b109237461e480cfeb40ce.tar.gz
nixlib-72e99b69154b1c8d50b109237461e480cfeb40ce.tar.bz2
nixlib-72e99b69154b1c8d50b109237461e480cfeb40ce.tar.lz
nixlib-72e99b69154b1c8d50b109237461e480cfeb40ce.tar.xz
nixlib-72e99b69154b1c8d50b109237461e480cfeb40ce.tar.zst
nixlib-72e99b69154b1c8d50b109237461e480cfeb40ce.zip
baudline: use jack2 instead of jack1
Otherwise it doesn't connect with the rest of the system.

[Bjørn: I think this is a symptom of jack1 packaging problem in nixpkgs.
The two libraries are _supposed_ to be interchangeable.]
-rw-r--r--pkgs/applications/audio/baudline/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix
index e3cef30ccdaa..deaa3f98e52e 100644
--- a/pkgs/applications/audio/baudline/default.nix
+++ b/pkgs/applications/audio/baudline/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, jack
+{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, libjack2
 , makeWrapper
 }:
 
 let
   rpath = stdenv.lib.makeLibraryPath
-    [ libXmu libXt libX11 libXext libXxf86vm jack ];
+    [ libXmu libXt libX11 libXext libXxf86vm libjack2 ];
 in
 stdenv.mkDerivation rec {
   name = "baudline-${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d9dc0b694c8..d008c7276447 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13459,9 +13459,7 @@ with pkgs;
 
   batti = callPackage ../applications/misc/batti { };
 
-  baudline = callPackage ../applications/audio/baudline {
-    jack = jack1;
-  };
+  baudline = callPackage ../applications/audio/baudline { };
 
 
   bazaar = callPackage ../applications/version-management/bazaar { };