git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #93240 from gebner/audacious405

audacious: 3.9 -> 4.0.5

commitfd726a9b26c1492b3298aa39ce595bde0b547257 authorGabriel Ebner <gebner@gebner.org> dateFri 17 Jul 2020, 10:24 (6 years ago) parent3ecbb6a7f64f21
3 files changed+29−124
pkgs/applications/audio/audacious/default.nix+27−30 pkgs/applications/audio/audacious/qt-5.nix−92 pkgs/top-level/all-packages.nix+2−2
pkgs/applications/audio/audacious/default.nix+27−30
@@ -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
pkgs/applications/audio/audacious/qt-5.nixdeleted−92
@@ -1,92 +0,0 @@
1−{
2− mkDerivation, lib, fetchurl, fetchpatch,
3− gettext, pkgconfig,
4− qtbase,
5− alsaLib, curl, faad2, ffmpeg_3, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
6− libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug,
7− libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
8− libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
9− wavpack
10−}:
11−
12−let
13− version = "3.9";
14− sources = {
15− "audacious-${version}" = fetchurl {
16− url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
17− sha256 = "0pmhrhsjhqnrq3zh4rhfys5jas53ph5ijkq010dxg1n779kl901d";
18− };
19−
20− "audacious-plugins-${version}" = fetchurl {
21− url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
22− sha256 = "1f17r7ar0mngcf7z41s6xh073vjafw3i7iy9ijb0cd6bi48g5xwb";
23− };
24− };
25−
26− qt510_plugins_patch = fetchpatch {
27− url = "https://github.com/audacious-media-player/audacious-plugins/commit/971f7ff7c3d8a0b9b420bf4fd19ab97755607637.patch";
28− sha256 = "15fy37syj9ygl2ibkkz3g3b9wd22vk9bjfmvqhhkpxphry2zwb17";
29− };
30−in
31−
32−mkDerivation {
33− inherit version;
34− name = "audacious-qt5-${version}";
35−
36− sourceFiles = lib.attrValues sources;
37− sourceRoots = lib.attrNames sources;
38−
39− nativeBuildInputs = [ gettext pkgconfig ];
40−
41− inherit qt510_plugins_patch;
42−
43− buildInputs = [
44− # Core dependencies
45− qtbase
46−
47− # Plugin dependencies
48− alsaLib curl faad2 ffmpeg_3 flac fluidsynth gdk-pixbuf lame libbs2b libcddb
49− libcdio libcue libjack2 libmad libmms libmodplug libmowgli
50− libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
51− libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
52− ];
53−
54− configureFlags = [ "--enable-qt" "--disable-gtk" ];
55−
56− # Here we build both audacious and audacious-plugins in one
57− # derivations, since they really expect to be in the same prefix.
58− # This is slighly tricky.
59− builder = builtins.toFile "builder.sh" ''
60− sourceFiles=( $sourceFiles )
61− sourceRoots=( $sourceRoots )
62− for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do
63−
64− (
65− # only patch the plugins
66− if [ "$i" -eq "1" ]; then
67− patches=( $qt510_plugins_patch )
68− fi
69− src=''${sourceFiles[$i]}
70− sourceRoot=''${sourceRoots[$i]}
71− source $stdenv/setup
72− genericBuild
73− )
74−
75− if [ $i == 0 ]; then
76− nativeBuildInputs="$out $nativeBuildInputs"
77− fi
78−
79− done
80− '';
81−
82− meta = with lib; {
83− description = "Audio player";
84− homepage = "https://audacious-media-player.org/";
85− maintainers = with maintainers; [ ttuegel ];
86− platforms = with platforms; linux;
87− license = with licenses; [
88− bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING
89− gpl2 gpl3 lgpl2Plus #http://redmine.audacious-media-player.org/issues/46
90− ];
91− };
92−}
pkgs/top-level/all-packages.nix+2−2
@@ -18990,8 +18990,8 @@ in
1899018990
1899118991 aucatctl = callPackage ../applications/audio/aucatctl { };
1899218992
18993− audacious = callPackage ../applications/audio/audacious { };
18994− audaciousQt5 = libsForQt5.callPackage ../applications/audio/audacious/qt-5.nix { };
18993+ audacious = libsForQt5.callPackage ../applications/audio/audacious { };
18994+ audaciousQt5 = audacious;
1899518995
1899618996 audacity = callPackage ../applications/audio/audacity { };
1899718997