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

audacious: move to pkgs/by-name

Browse Source
This commit is contained in:
Thiago Kenji Okada 2024-11-25 17:26:31 +00:00
parent 5a39f9caaa
commit d0b8e7beac
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,10 +6,8 @@
meson, meson,
ninja, ninja,
pkg-config, pkg-config,
qtbase, qt6,
qtsvg, withPlugins ? false,
qtwayland,
wrapQtAppsHook,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -27,13 +25,13 @@ stdenv.mkDerivation rec {
meson meson
ninja ninja
pkg-config pkg-config
wrapQtAppsHook qt6.wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [
qtbase qt6.qtbase
qtsvg qt6.qtsvg
qtwayland qt6.qtwayland
]; ];
mesonFlags = [ mesonFlags = [
@ -41,7 +39,7 @@ stdenv.mkDerivation rec {
"-Dbuildstamp=NixOS" "-Dbuildstamp=NixOS"
]; ];
postInstall = lib.optionalString (audacious-plugins != null) '' postInstall = lib.optionalString withPlugins ''
ln -s ${audacious-plugins}/lib/audacious $out/lib ln -s ${audacious-plugins}/lib/audacious $out/lib
ln -s ${audacious-plugins}/share/audacious/Skins $out/share/audacious/ ln -s ${audacious-plugins}/share/audacious/Skins $out/share/audacious/
''; '';

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

@ -13382,8 +13382,7 @@ with pkgs;
protobuf = protobuf_21; protobuf = protobuf_21;
}; };
audacious-bare = audacious.override { audacious-plugins = null; }; audacious = audacious-bare.override { withPlugins = true; };
audacious = qt6Packages.callPackage ../applications/audio/audacious { };
av-98 = callPackage ../applications/networking/browsers/av-98 { }; av-98 = callPackage ../applications/networking/browsers/av-98 { };