Unverified Commit 14d8568f authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #324857 from zendo/upd/audacious 

{audacious, audacious-plugins}: 4.3.1 -> 4.4, port to qt6
parents 81c768e2 ffd8cb92

pkgs/applications/audio/audacious/default.nix

+18 −12
Original line number Diff line number Diff line 
{ lib

, stdenv

, audacious-plugins

, fetchurl

, gettext

, fetchFromGitHub

, meson

, ninja

, pkg-config

, qtbase

, qtsvg

, qtwayland

, wrapQtAppsHook

}:



stdenv.mkDerivation rec {

  pname = "audacious";

  version = "4.3.1";

  version = "4.4";



  src = fetchurl {

    url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";

    sha256 = "sha256-heniaEFQW1HjQu5yotBfGb74lPVnoCnrs/Pgwa20IEI=";

  src = fetchFromGitHub {

    owner = "audacious-media-player";

    repo = "audacious";

    rev = "${pname}-${version}";

    hash = "sha256-qAJztvNI3uGmQfECJJ7tJ/xLLgMU5OiW0O3ZSJhvt0k=";

  };



  nativeBuildInputs = [

    gettext

    meson

    ninja

    pkg-config
@@ -29,6 +31,8 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    qtbase

    qtsvg

    qtwayland

  ];



  mesonFlags = [
@@ -41,12 +45,14 @@ stdenv.mkDerivation rec { 
    ln -s ${audacious-plugins}/share/audacious/Skins $out/share/audacious/

  '';



  meta = with lib; {

  meta = {

    description = "Lightweight and versatile audio player";

    homepage = "https://audacious-media-player.org/";

    maintainers = with maintainers; [ eelco ramkromberg ttuegel thiagokokada ];

    platforms = with platforms; linux;

    license = with licenses; [

    homepage = "https://audacious-media-player.org";

    downloadPage = "https://github.com/audacious-media-player/audacious";

    mainProgram = "audacious";

    maintainers = with lib.maintainers; [ eelco ramkromberg ttuegel thiagokokada ];

    platforms = lib.platforms.linux;

    license = with lib.licenses; [

      bsd2

      bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING

      gpl2

pkgs/applications/audio/audacious/plugins.nix

+10 −9
Original line number Diff line number Diff line 
{ stdenv

, fetchurl

, fetchFromGitHub

, alsa-lib

, audacious

, curl
@@ -8,7 +8,6 @@ 
, flac

, fluidsynth

, gdk-pixbuf

, gettext

, lame

, libbs2b

, libcddb
@@ -39,7 +38,7 @@ 
, pipewire

, qtbase

, qtmultimedia

, qtx11extras

, qtwayland

, soxr

, vgmstream

, wavpack
@@ -47,17 +46,18 @@ 


stdenv.mkDerivation rec {

  pname = "audacious-plugins";

  version = "4.3.1";

  version = "4.4";



  src = fetchurl {

    url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";

    sha256 = "sha256-Leom469YOi1oTfJAsnsrKTK81lPfTbUAqF9P5dX9yKY=";

  src = fetchFromGitHub {

    owner = "audacious-media-player";

    repo = "audacious-plugins";

    rev = "${pname}-${version}";

    hash = "sha256-J9jgBl8J4W9Yvrlg1KlzYgGTmdxUZM9L11rCftKFSlE=";

  };



  patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ];



  nativeBuildInputs = [

    gettext

    meson

    ninja

    pkg-config
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec { 
    pipewire

    qtbase

    qtmultimedia

    qtx11extras

    qtwayland

    soxr

    wavpack

    libopenmpt
@@ -116,5 +116,6 @@ stdenv.mkDerivation rec { 


  meta = audacious.meta // {

    description = "Plugins for Audacious music player";

    downloadPage = "https://github.com/audacious-media-player/audacious-plugins";

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ mapAliases ({ 
  atom-beta = throw "'atom-beta' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01

  atomEnv = throw "'atomEnv' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01

  atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01

  audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06

  auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02

  authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19

  avldrums-lv2 = x42-avldrums; # Added 2020-03-29

pkgs/top-level/all-packages.nix

+2 −3
Original line number Diff line number Diff line
@@ -29429,12 +29429,11 @@ with pkgs; 














  aucatctl = callPackage ../applications/audio/aucatctl { };



























  audacious = libsForQt5.callPackage ../applications/audio/audacious { };













  audacious-plugins = libsForQt5.callPackage ../applications/audio/audacious/plugins.nix {













  audacious = qt6Packages.callPackage ../applications/audio/audacious { };













  audacious-plugins = qt6Packages.callPackage ../applications/audio/audacious/plugins.nix {















    # Avoid circular dependency















    audacious = audacious.override { audacious-plugins = null; };















  };













  audaciousQt5 = audacious;





























  audacity = callPackage ../applications/audio/audacity {















    inherit (darwin.apple_sdk.frameworks) AppKit CoreAudioKit;