colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #298075 from wegank/drumstick-bump 

libsForQt5.drumstick: 2.7.2 -> 2.9.0
This commit is contained in:
Weijia Wang 2024-03-24 23:39:44 +01:00 committed by GitHub
parent 8da98e9d45 182ed06f05
commit 3d6b90d234
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/audio/kmetronome/default.nix
View File

@ -1,15 +1,15 @@
{ lib, stdenv, fetchurl, cmake, pkg-config, qttools, alsa-lib, drumstick, qtbase, qtsvg }:
{ lib, stdenv, fetchurl, cmake, pandoc, pkg-config, qttools, alsa-lib, drumstick, qtbase, qtsvg }:
stdenv.mkDerivation rec {
pname = "kmetronome";
version = "1.2.0";
version = "1.4.0";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2";
sha256 = "1ln0nm24w6bj7wc8cay08j5azzznigd39cbbw3h4skg6fxd8p0s7";
hash = "sha256-51uFAPR0xsY3z9rFc8SdSGu4ae/VzUmC1qC8RGdt48Y=";
};
nativeBuildInputs = [ cmake pkg-config qttools ];
nativeBuildInputs = [ cmake pandoc pkg-config qttools ];
buildInputs = [ alsa-lib drumstick qtbase qtsvg ];

18
pkgs/development/libraries/drumstick/default.nix
View File

@ -1,15 +1,18 @@
{ lib, stdenv, fetchurl
, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook
, alsa-lib, fluidsynth, libpulseaudio, qtbase, qtsvg, sonivox
, alsa-lib, fluidsynth, libpulseaudio, qtbase, qtsvg, sonivox, qt5compat ? null
}:
let
isQt6 = lib.versions.major qtbase.version == "6";
in
stdenv.mkDerivation rec {
pname = "drumstick";
version = "2.7.2";
version = "2.9.0";
src = fetchurl {
url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
hash = "sha256-5XxG5ur584fgW4oCONgMiWzV48Q02HEdmpb9+YhBFe0=";
hash = "sha256-p0N8EeCtVEPCGzPwiRxPdI1XT5XQ5pcKYEDJXbYYTrM=";
};
patches = [
@ -28,17 +31,18 @@ stdenv.mkDerivation rec {
buildInputs = [
alsa-lib fluidsynth libpulseaudio qtbase qtsvg sonivox
];
] ++ lib.optionals isQt6 [ qt5compat ];
cmakeFlags = [
"-DUSE_DBUS=ON"
(lib.cmakeBool "USE_DBUS" true)
(lib.cmakeBool "USE_QT5" (!isQt6))
];
meta = with lib; {
maintainers = [];
description = "MIDI libraries for Qt5/C++";
description = "MIDI libraries for Qt/C++";
homepage = "https://drumstick.sourceforge.io/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ wegank ];
platforms = platforms.linux;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -32473,7 +32473,7 @@ with pkgs;
stdenv = stdenv;
});
kmetronome = libsForQt5.callPackage ../applications/audio/kmetronome { };
kmetronome = qt6Packages.callPackage ../applications/audio/kmetronome { };
kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };

2
pkgs/top-level/qt6-packages.nix
View File

@ -33,6 +33,8 @@ makeScopeWithSplicing' {
accounts-qt = callPackage ../development/libraries/accounts-qt { };
appstream-qt = callPackage ../development/libraries/appstream/qt.nix { };
drumstick = callPackage ../development/libraries/drumstick { };
fcitx5-chinese-addons = callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { };
fcitx5-configtool = kdePackages.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { };