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

{audacious, audacious-plugins}: 4.3.1 -> 4.4, port to qt6

Browse Source
This commit is contained in:
zendo 2024-07-06 00:06:13 +08:00
parent 1af787b0e7
commit fbc4ea0a51
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/audio/audacious/default.nix
View File

@ -1,26 +1,28 @@
{ lib { lib
, stdenv , stdenv
, audacious-plugins , audacious-plugins
, fetchurl , fetchFromGitHub
, gettext
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, qtbase , qtbase
, qtsvg
, qtwayland
, wrapQtAppsHook , wrapQtAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "audacious"; pname = "audacious";
version = "4.3.1"; version = "4.4";
src = fetchurl { src = fetchFromGitHub {
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; owner = "audacious-media-player";
sha256 = "sha256-heniaEFQW1HjQu5yotBfGb74lPVnoCnrs/Pgwa20IEI="; repo = "audacious";
rev = "${pname}-${version}";
hash = "sha256-qAJztvNI3uGmQfECJJ7tJ/xLLgMU5OiW0O3ZSJhvt0k=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
gettext
meson meson
ninja ninja
pkg-config pkg-config
@ -29,6 +31,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
qtbase qtbase
qtsvg
qtwayland
]; ];
mesonFlags = [ mesonFlags = [
@ -41,12 +45,14 @@ stdenv.mkDerivation rec {
ln -s ${audacious-plugins}/share/audacious/Skins $out/share/audacious/ ln -s ${audacious-plugins}/share/audacious/Skins $out/share/audacious/
''; '';
meta = with lib; { meta = {
description = "Lightweight and versatile audio player"; description = "Lightweight and versatile audio player";
homepage = "https://audacious-media-player.org/"; homepage = "https://audacious-media-player.org";
maintainers = with maintainers; [ eelco ramkromberg ttuegel thiagokokada ]; downloadPage = "https://github.com/audacious-media-player/audacious";
platforms = with platforms; linux; mainProgram = "audacious";
license = with licenses; [ maintainers = with lib.maintainers; [ eelco ramkromberg ttuegel thiagokokada ];
platforms = lib.platforms.linux;
license = with lib.licenses; [
bsd2 bsd2
bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING
gpl2 gpl2

19
pkgs/applications/audio/audacious/plugins.nix
View File

@ -1,5 +1,5 @@
{ stdenv { stdenv
, fetchurl , fetchFromGitHub
, alsa-lib , alsa-lib
, audacious , audacious
, curl , curl
@ -8,7 +8,6 @@
, flac , flac
, fluidsynth , fluidsynth
, gdk-pixbuf , gdk-pixbuf
, gettext
, lame , lame
, libbs2b , libbs2b
, libcddb , libcddb
@ -39,7 +38,7 @@
, pipewire , pipewire
, qtbase , qtbase
, qtmultimedia , qtmultimedia
, qtx11extras , qtwayland
, soxr , soxr
, vgmstream , vgmstream
, wavpack , wavpack
@ -47,17 +46,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "audacious-plugins"; pname = "audacious-plugins";
version = "4.3.1"; version = "4.4";
src = fetchurl { src = fetchFromGitHub {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; owner = "audacious-media-player";
sha256 = "sha256-Leom469YOi1oTfJAsnsrKTK81lPfTbUAqF9P5dX9yKY="; repo = "audacious-plugins";
rev = "${pname}-${version}";
hash = "sha256-J9jgBl8J4W9Yvrlg1KlzYgGTmdxUZM9L11rCftKFSlE=";
}; };
patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ]; patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ];
nativeBuildInputs = [ nativeBuildInputs = [
gettext
meson meson
ninja ninja
pkg-config pkg-config
@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
pipewire pipewire
qtbase qtbase
qtmultimedia qtmultimedia
qtx11extras qtwayland
soxr soxr
wavpack wavpack
libopenmpt libopenmpt
@ -116,5 +116,6 @@ stdenv.mkDerivation rec {
meta = audacious.meta // { meta = audacious.meta // {
description = "Plugins for Audacious music player"; description = "Plugins for Audacious music player";
downloadPage = "https://github.com/audacious-media-player/audacious-plugins";
}; };
} }

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

@ -29447,8 +29447,8 @@ with pkgs;
aucatctl = callPackage ../applications/audio/aucatctl { }; aucatctl = callPackage ../applications/audio/aucatctl { };
audacious = libsForQt5.callPackage ../applications/audio/audacious { }; audacious = qt6Packages.callPackage ../applications/audio/audacious { };
audacious-plugins = libsForQt5.callPackage ../applications/audio/audacious/plugins.nix { audacious-plugins = qt6Packages.callPackage ../applications/audio/audacious/plugins.nix {
# Avoid circular dependency # Avoid circular dependency
audacious = audacious.override { audacious-plugins = null; }; audacious = audacious.override { audacious-plugins = null; };
}; };