From 5ea858139a9c7adeaa290d892793a60821ae92e8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 24 Dec 2020 12:35:40 +0100 Subject: [PATCH] qjackctl: 0.6.3 -> 0.9.0 --- pkgs/applications/audio/qjackctl/default.nix | 27 ++++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 571fb0a09cc..4ac64afe854 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,18 +1,20 @@ -{ stdenv, mkDerivation, fetchurl -, pkg-config, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras +{ stdenv, mkDerivation, fetchFromGitHub +, pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras # Enable jack session support , jackSession ? false }: mkDerivation rec { - version = "0.6.3"; + version = "0.9.0"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally - src = fetchurl { - url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz"; - sha256 = "0zbb4jlx56qvcqyhx34mbagkqf3wbxgj84hk0ppf5cmcrxv67d4x"; + src = fetchFromGitHub { + owner = "rncbc"; + repo = "qjackctl"; + rev = "${pname}_${stdenv.lib.replaceChars ["."] ["_"] version}"; + sha256 = "044kgwk7pfywad4myza0s2kvfkl21zkqq5wgny7n3c43qlcgs3zr"; }; buildInputs = [ @@ -24,16 +26,19 @@ mkDerivation rec { dbus ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - configureFlags = [ - "--enable-jack-version" - (stdenv.lib.strings.enableFeature jackSession "jack-session") + cmakeFlags = [ + "-DCONFIG_JACK_VERSION=1" + "-DCONFIG_JACK_SESSION=${toString jackSession}" ]; meta = with stdenv.lib; { description = "A Qt application to control the JACK sound server daemon"; - homepage = "http://qjackctl.sourceforge.net/"; + homepage = "https://github.com/rncbc/qjackctl"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux;