@@ -1,39 +1,40 @@
1−{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
2−, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib
3−, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
4−, libcdio, libcddb, flac, ffmpeg_3, mpg123, libcue, libmms, libbs2b
5−, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
6−, neon, faad2, lame, libnotify, libsidplayfp
1+{
2+ mkDerivation, lib, fetchurl, fetchpatch,
3+ gettext, pkgconfig,
4+ qtbase,
5+ alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
6+ libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug,
7+ libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
8+ libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
9+ wavpack, openmpt123
710}:
811
9−stdenv.mkDerivation rec {
12+mkDerivation rec {
1013 pname = "audacious";
11− version = "3.9";
14+ version = "4.0.5";
1215
1316 src = fetchurl {
14− url = "https://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2";
15− sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm";
17+ url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
18+ sha256 = "028zjgz0p7ys15lk2a30m5zcv9xrx3ga50wjsh4m4zxilgkakbji";
1619 };
17−
1820 pluginsSrc = fetchurl {
19− url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2";
20− sha256 = "1gck37c5pnzxdhrnb1g75b5hi31s2dc952wifxns45pkdlayrmra";
21+ url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
22+ sha256 = "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz";
2123 };
2224
23− nativeBuildInputs = [
24− pkgconfig wrapGAppsHook
25− ];
25+ nativeBuildInputs = [ gettext pkgconfig ];
2626
2727 buildInputs = [
28− gettext glib gtk3 libmowgli dbus-glib libxml2
29− xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2
30− libpulseaudio fluidsynth libmad libogg libvorbis libcdio
31− libcddb flac ffmpeg_3 mpg123 libcue libmms libbs2b libsndfile
32− libmodplug libsamplerate soxr lirc curl wavpack neon faad2
33− lame libnotify libsidplayfp
34− ];
28+ # Core dependencies
29+ qtbase
3530
36− configureFlags = [ "--enable-statusicon" ];
31+ # Plugin dependencies
32+ alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb
33+ libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli
34+ libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
35+ libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
36+ openmpt123
37+ ];
3738
3839 # Here we build both audacious and audacious-plugins in one
3940 # derivations, since they really expect to be in the same prefix.
@@ -44,10 +45,8 @@ stdenv.mkDerivation rec {
4445 source $stdenv/setup
4546 genericBuild
4647 )
47−
4848 # Then build the plugins.
4949 (
50− dontWrapGApps=true
5150 nativeBuildInputs="$out $nativeBuildInputs" # to find audacious
5251 source $stdenv/setup
5352 rm -rfv audacious-*
@@ -56,12 +55,10 @@ stdenv.mkDerivation rec {
5655 )
5756 '';
5857
59− enableParallelBuilding = true;
60−
61− meta = with stdenv.lib; {
58+ meta = with lib; {
6259 description = "Audio player";
6360 homepage = "https://audacious-media-player.org/";
64− maintainers = with maintainers; [ eelco ramkromberg ];
61+ maintainers = with maintainers; [ eelco ramkromberg ttuegel ];
6562 platforms = with platforms; linux;
6663 license = with licenses; [
6764 bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING