From b5d838aff647259a8d1a6c1265025b9115409e51 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 31 Aug 2024 08:59:41 +0200 Subject: [PATCH 1/2] qt6Packages.drumstick: format with nixfmt --- .../libraries/drumstick/default.nix | 49 +++++++++++++++---- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 4b797031696a..5f1867cd5a2e 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -1,6 +1,22 @@ -{ lib, stdenv, fetchurl -, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook -, alsa-lib, fluidsynth, libpulseaudio, qtbase, qtsvg, sonivox, qt5compat ? null +{ + lib, + stdenv, + fetchurl, + cmake, + docbook_xml_dtd_45, + docbook_xsl, + doxygen, + graphviz-nox, + pkg-config, + qttools, + wrapQtAppsHook, + alsa-lib, + fluidsynth, + libpulseaudio, + qtbase, + qtsvg, + sonivox, + qt5compat ? null, }: let @@ -15,22 +31,37 @@ stdenv.mkDerivation rec { hash = "sha256-p0N8EeCtVEPCGzPwiRxPdI1XT5XQ5pcKYEDJXbYYTrM="; }; - patches = [ - ./drumstick-plugins.patch - ]; + patches = [ ./drumstick-plugins.patch ]; postPatch = '' substituteInPlace library/rt/backendmanager.cpp --subst-var out ''; - outputs = [ "out" "dev" "man" ]; + outputs = [ + "out" + "dev" + "man" + ]; nativeBuildInputs = [ - cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen graphviz-nox pkg-config qttools wrapQtAppsHook + cmake + docbook_xml_dtd_45 + docbook_xml_dtd_45 + docbook_xsl + doxygen + graphviz-nox + pkg-config + qttools + wrapQtAppsHook ]; buildInputs = [ - alsa-lib fluidsynth libpulseaudio qtbase qtsvg sonivox + alsa-lib + fluidsynth + libpulseaudio + qtbase + qtsvg + sonivox ] ++ lib.optionals isQt6 [ qt5compat ]; cmakeFlags = [ From f8bca49147e4d8f897097e1af21efd6c3ddb33af Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 31 Aug 2024 09:00:47 +0200 Subject: [PATCH 2/2] qt6Packages.drumstick: 2.9.0 -> 2.9.1 --- pkgs/development/libraries/drumstick/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 5f1867cd5a2e..3f2b1ba026ab 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -15,6 +15,7 @@ libpulseaudio, qtbase, qtsvg, + qtwayland, sonivox, qt5compat ? null, }: @@ -24,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-p0N8EeCtVEPCGzPwiRxPdI1XT5XQ5pcKYEDJXbYYTrM="; + hash = "sha256-U5Cm9pTDxC8NzyQfjaC/eBBDUWELV4jq4ov4QGefM9g="; }; patches = [ ./drumstick-plugins.patch ]; @@ -61,6 +62,7 @@ stdenv.mkDerivation rec { libpulseaudio qtbase qtsvg + qtwayland sonivox ] ++ lib.optionals isQt6 [ qt5compat ];