audacious: move to pkgs/by-name
This commit is contained in:
parent
5a39f9caaa
commit
d0b8e7beac
@ -6,10 +6,8 @@
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
qtwayland,
|
||||
wrapQtAppsHook,
|
||||
qt6,
|
||||
withPlugins ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -27,13 +25,13 @@ stdenv.mkDerivation rec {
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
qtwayland
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
qt6.qtwayland
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
@ -41,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/
|
||||
'';
|
@ -13382,8 +13382,7 @@ with pkgs;
|
||||
protobuf = protobuf_21;
|
||||
};
|
||||
|
||||
audacious-bare = audacious.override { audacious-plugins = null; };
|
||||
audacious = qt6Packages.callPackage ../applications/audio/audacious { };
|
||||
audacious = audacious-bare.override { withPlugins = true; };
|
||||
|
||||
av-98 = callPackage ../applications/networking/browsers/av-98 { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user