diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 6eea4562de9..00931a21011 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,21 +1,19 @@ -{ lib, mkDerivation, fetchurl, cmake, pkg-config -, qtbase, qttools, qtmultimedia, qtx11extras +{ lib, stdenv, fetchurl, cmake, pkg-config +, qtbase, qttools, qtmultimedia, wrapQtAppsHook # transports , curl, libmms # input plugins , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile -, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi +, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi, libbs2b, game-music-emu # output plugins -, alsa-lib, libpulseaudio +, alsa-lib, libpulseaudio, pipewire # effect plugins , libsamplerate }: # Additional plugins that can be added: # wavpack (https://www.wavpack.com/) -# gme (Game music support) # Ogg Opus support -# BS2B effect plugin (http://bs2b.sourceforge.net/) # JACK audio support # ProjectM visualization plugin @@ -28,26 +26,27 @@ # Qmmp installs working .desktop file(s) all by itself, so we don't need to # handle that. -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qmmp"; - version = "1.4.4"; + version = "2.1.2"; src = fetchurl { - url = "https://qmmp.ylsoftware.com/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-sZRZVhCf2ceETuV4AULA0kVkuIMn3C+aYdKThqvPnVQ="; + url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; + hash = "sha256-U86LoAkg6mBFVa/cgB8kpCa5KwdkR0PMQmAGvf/KAXo="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ # basic requirements - qtbase qttools qtmultimedia qtx11extras + qtbase qttools qtmultimedia # transports curl libmms # input plugins libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile - libcdio cdparanoia libcddb faad2 ffmpeg wildmidi + libcdio cdparanoia libcddb faad2 ffmpeg wildmidi libbs2b game-music-emu # output plugins - alsa-lib libpulseaudio + alsa-lib libpulseaudio pipewire # effect plugins libsamplerate ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28ceea8c98b..a286d86b7c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31547,7 +31547,7 @@ with pkgs; qmidiroute = callPackage ../applications/audio/qmidiroute { }; - qmmp = libsForQt5.callPackage ../applications/audio/qmmp { }; + qmmp = qt6Packages.callPackage ../applications/audio/qmmp { }; qnotero = libsForQt5.callPackage ../applications/office/qnotero { };