From 72e99b69154b1c8d50b109237461e480cfeb40ce Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 25 Jul 2017 17:54:24 +0200 Subject: [PATCH] baudline: use jack2 instead of jack1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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.] --- pkgs/applications/audio/baudline/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index e3cef30ccda..deaa3f98e52 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 2d9dc0b694c..d008c727644 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 { };