audacious: migrate to meson build system, refactor
Separate the derivation in `audacious` and `audacious-plugins`. Since one derivation depends on the other, we first build `audacious` without the `audacious-plugins`, them we build `audacious-plugins` and finally we build the final version of `audacious`. Also, add myself as maintainer.
This commit is contained in:
parent
f73b6e98b1
commit
b8dc7a5e88
|
@ -0,0 +1,25 @@
|
|||
From b64b03be9edf23a80fce0c76de61ffff0914ddce Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Kenji Okada <thiagokokada@gmail.com>
|
||||
Date: Mon, 8 Aug 2022 10:28:33 +0100
|
||||
Subject: [PATCH] Set plugindir to $PREFIX/lib/audacious
|
||||
|
||||
---
|
||||
meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 3f7996f72..ab09d6476 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -160,7 +160,7 @@ if (cxx.has_header('libintl.h'))
|
||||
endif
|
||||
|
||||
|
||||
-install_plugindir = audacious_dep.get_variable(pkgconfig: 'plugin_dir')
|
||||
+install_plugindir = join_paths(get_option('prefix'), 'lib/audacious')
|
||||
|
||||
|
||||
conf.set_quoted('INSTALL_PLUGINDIR', install_plugindir)
|
||||
--
|
||||
2.36.0
|
||||
|
|
@ -1,15 +1,16 @@
|
|||
{
|
||||
mkDerivation, lib, fetchurl, fetchpatch,
|
||||
gettext, pkg-config,
|
||||
qtbase,
|
||||
alsa-lib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
|
||||
libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug,
|
||||
libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
|
||||
libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
|
||||
wavpack, libopenmpt
|
||||
{ lib
|
||||
, stdenv
|
||||
, audacious-plugins
|
||||
, fetchurl
|
||||
, gettext
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audacious";
|
||||
version = "4.2";
|
||||
|
||||
|
@ -17,54 +18,39 @@ mkDerivation rec {
|
|||
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
|
||||
sha256 = "sha256-/rME5HCkgf4rPEyhycs7I+wmJUDBLQ0ebCKl62JeBLM=";
|
||||
};
|
||||
pluginsSrc = fetchurl {
|
||||
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
|
||||
sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
# Core dependencies
|
||||
qtbase
|
||||
|
||||
# Plugin dependencies
|
||||
alsa-lib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb
|
||||
libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli
|
||||
libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
|
||||
libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
|
||||
libopenmpt
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
configureFlags = [ "--disable-gtk" ];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
];
|
||||
|
||||
# Here we build both audacious and audacious-plugins in one
|
||||
# derivation, since they really expect to be in the same prefix.
|
||||
# This is slighly tricky.
|
||||
builder = builtins.toFile "builder.sh" ''
|
||||
# First build audacious.
|
||||
(
|
||||
source $stdenv/setup
|
||||
genericBuild
|
||||
)
|
||||
# Then build the plugins.
|
||||
(
|
||||
nativeBuildInputs="$out $nativeBuildInputs" # to find audacious
|
||||
source $stdenv/setup
|
||||
rm -rfv audacious-*
|
||||
src=$pluginsSrc
|
||||
genericBuild
|
||||
)
|
||||
mesonFlags = [
|
||||
"-Dgtk=false"
|
||||
"-Dbuildstamp=NixOS"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (audacious-plugins != null) ''
|
||||
ln -s ${audacious-plugins}/lib/audacious $out/lib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Audio player";
|
||||
description = "A lightweight and versatile audio player";
|
||||
homepage = "https://audacious-media-player.org/";
|
||||
maintainers = with maintainers; [ eelco ramkromberg ttuegel ];
|
||||
maintainers = with maintainers; [ eelco ramkromberg ttuegel thiagokokada ];
|
||||
platforms = with platforms; linux;
|
||||
license = with licenses; [
|
||||
bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING
|
||||
gpl2 gpl3 lgpl2Plus #http://redmine.audacious-media-player.org/issues/46
|
||||
bsd2
|
||||
bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING
|
||||
gpl2
|
||||
gpl3
|
||||
lgpl2Plus #http://redmine.audacious-media-player.org/issues/46
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
109
pkgs/applications/audio/audacious/plugins.nix
Normal file
109
pkgs/applications/audio/audacious/plugins.nix
Normal file
|
@ -0,0 +1,109 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, alsa-lib
|
||||
, audacious
|
||||
, curl
|
||||
, faad2
|
||||
, ffmpeg
|
||||
, flac
|
||||
, fluidsynth
|
||||
, gdk-pixbuf
|
||||
, gettext
|
||||
, lame
|
||||
, libbs2b
|
||||
, libcddb
|
||||
, libcdio
|
||||
, libcdio-paranoia
|
||||
, libcue
|
||||
, libjack2
|
||||
, libmad
|
||||
, libmms
|
||||
, libmodplug
|
||||
, libmowgli
|
||||
, libnotify
|
||||
, libogg
|
||||
, libopenmpt
|
||||
, libpulseaudio
|
||||
, libsamplerate
|
||||
, libsidplayfp
|
||||
, libsndfile
|
||||
, libvorbis
|
||||
, libxml2
|
||||
, lirc
|
||||
, meson
|
||||
, mpg123
|
||||
, neon
|
||||
, ninja
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, soxr
|
||||
, wavpack
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audacious-plugins";
|
||||
version = "4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
|
||||
sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
audacious
|
||||
alsa-lib
|
||||
curl
|
||||
faad2
|
||||
ffmpeg
|
||||
flac
|
||||
fluidsynth
|
||||
gdk-pixbuf
|
||||
lame
|
||||
libbs2b
|
||||
libcddb
|
||||
libcdio
|
||||
libcdio-paranoia
|
||||
libcue
|
||||
libjack2
|
||||
libmad
|
||||
libmms
|
||||
libmodplug
|
||||
libmowgli
|
||||
libnotify
|
||||
libogg
|
||||
libpulseaudio
|
||||
libsamplerate
|
||||
libsidplayfp
|
||||
libsndfile
|
||||
libvorbis
|
||||
libxml2
|
||||
lirc
|
||||
mpg123
|
||||
neon
|
||||
qtbase
|
||||
qtmultimedia
|
||||
soxr
|
||||
wavpack
|
||||
libopenmpt
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtk=false"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = audacious.meta // {
|
||||
description = "Plugins for Audacious music player";
|
||||
};
|
||||
}
|
|
@ -25959,6 +25959,10 @@ with pkgs;
|
|||
aucatctl = callPackage ../applications/audio/aucatctl { };
|
||||
|
||||
audacious = libsForQt5.callPackage ../applications/audio/audacious { };
|
||||
audacious-plugins = libsForQt5.callPackage ../applications/audio/audacious/plugins.nix {
|
||||
# Avoid circular dependency
|
||||
audacious = audacious.override { audacious-plugins = null; };
|
||||
};
|
||||
audaciousQt5 = audacious;
|
||||
|
||||
audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; };
|
||||
|
|
Loading…
Reference in a new issue