Unverified Commit 048619c6 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

audacious: move to pkgs/by-name (#359063)

parents 8e82ef5d d0b8e7be

pkgs/applications/audio/audacious/default.nix→pkgs/by-name/au/audacious-bare/package.nix

+22 −19
Original line number Diff line number Diff line 
{ lib

, stdenv

, audacious-plugins

, fetchFromGitHub

, meson

, ninja

, pkg-config

, qtbase

, qtsvg

, qtwayland

, wrapQtAppsHook

{

  lib,

  stdenv,

  audacious-plugins,

  fetchFromGitHub,

  meson,

  ninja,

  pkg-config,

  qt6,

  withPlugins ? false,

}:



stdenv.mkDerivation rec {
@@ -26,13 +25,13 @@ stdenv.mkDerivation rec { 
    meson

    ninja

    pkg-config

    wrapQtAppsHook

    qt6.wrapQtAppsHook

  ];



  buildInputs = [

    qtbase

    qtsvg

    qtwayland

    qt6.qtbase

    qt6.qtsvg

    qt6.qtwayland

  ];



  mesonFlags = [
@@ -40,7 +39,7 @@ stdenv.mkDerivation rec { 
    "-Dbuildstamp=NixOS"

  ];



  postInstall = lib.optionalString (audacious-plugins != null) ''

  postInstall = lib.optionalString withPlugins ''

    ln -s ${audacious-plugins}/lib/audacious $out/lib

    ln -s ${audacious-plugins}/share/audacious/Skins $out/share/audacious/

  '';
@@ -50,7 +49,11 @@ stdenv.mkDerivation rec { 
    homepage = "https://audacious-media-player.org";

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

    mainProgram = "audacious";

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

    maintainers = with lib.maintainers; [

      ramkromberg

      ttuegel

      thiagokokada

    ];

    platforms = lib.platforms.linux;

    license = with lib.licenses; [

      bsd2

pkgs/applications/audio/audacious/plugins.nix→pkgs/by-name/au/audacious-plugins/package.nix

+51 −50
Original line number Diff line number Diff line 
{ stdenv

, fetchFromGitHub

, alsa-lib

, audacious

, curl

, faad2

, ffmpeg

, flac

, fluidsynth

, gdk-pixbuf

, 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

, opusfile

, pipewire

, qtbase

, qtmultimedia

, qtwayland

, soxr

, vgmstream

, wavpack

{

  stdenv,

  fetchFromGitHub,

  alsa-lib,

  audacious-bare,

  curl,

  faad2,

  ffmpeg,

  flac,

  fluidsynth,

  gdk-pixbuf,

  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,

  opusfile,

  pipewire,

  qt6,

  soxr,

  vgmstream,

  wavpack,

}:



stdenv.mkDerivation rec {
@@ -64,7 +63,7 @@ stdenv.mkDerivation rec { 
  ];



  buildInputs = [

    audacious

    audacious-bare

    alsa-lib

    curl

    faad2
@@ -96,9 +95,9 @@ stdenv.mkDerivation rec { 
    neon

    opusfile

    pipewire

    qtbase

    qtmultimedia

    qtwayland

    qt6.qtbase

    qt6.qtmultimedia

    qt6.qtwayland

    soxr

    wavpack

    libopenmpt
@@ -111,10 +110,12 @@ stdenv.mkDerivation rec { 
  dontWrapQtApps = true;



  postInstall = ''

    ln -s ${vgmstream.override { buildAudaciousPlugin = true; }}/lib/audacious/Input/* $out/lib/audacious/Input

    ln -s ${

      vgmstream.override { buildAudaciousPlugin = true; }

    }/lib/audacious/Input/* $out/lib/audacious/Input

  '';



  meta = audacious.meta // {

  meta = audacious-bare.meta // {

    description = "Plugins for Audacious music player";

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

  };

pkgs/by-name/vg/vgmstream/package.nix

+25 −10
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, gtk3

, audacious, mpg123, ffmpeg, libvorbis, libao, jansson, speex

, nix-update-script

, buildAudaciousPlugin ? false  # only build cli by default, pkgs.audacious-plugins sets this to enable plugin support

{

  stdenv,

  lib,

  fetchFromGitHub,

  cmake,

  pkg-config,

  gtk3,

  audacious-bare,

  mpg123,

  ffmpeg,

  libvorbis,

  libao,

  jansson,

  speex,

  nix-update-script,

  buildAudaciousPlugin ? false, # only build cli by default, pkgs.audacious-plugins sets this to enable plugin support

}:



stdenv.mkDerivation rec {
@@ -17,7 +29,10 @@ stdenv.mkDerivation rec { 


  passthru.updateScript = nix-update-script {

    attrPath = "vgmstream";

    extraArgs = [ "--version-regex" "r(.*)" ];

    extraArgs = [

      "--version-regex"

      "r(.*)"

    ];

  };



  nativeBuildInputs = [
@@ -32,7 +47,7 @@ stdenv.mkDerivation rec { 
    libao

    jansson

    speex

  ] ++ lib.optional buildAudaciousPlugin (audacious.override { audacious-plugins = null; });

  ] ++ lib.optional buildAudaciousPlugin audacious-bare;



  preConfigure = ''

    substituteInPlace cmake/dependencies/audacious.cmake \

pkgs/top-level/all-packages.nix

+1 −5
Original line number Diff line number Diff line
@@ -13356,11 +13356,7 @@ with pkgs; 
    protobuf = protobuf_21;

  };













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













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













    # Avoid circular dependency













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













  };













  audacious = audacious-bare.override { withPlugins = true; };





























  av-98 = callPackage ../applications/networking/browsers/av-98 { };