avidemux: move to pkgs/by-name

This commit is contained in:
aleksana
2025-02-12 10:38:36 +08:00
parent 2363cc101e
commit 4b19f0fa2e
4 changed files with 9 additions and 11 deletions
@@ -18,9 +18,6 @@
makeWrapper,
libXext,
libGLU,
qttools,
qtbase,
wrapQtAppsHook,
alsa-lib,
withX265 ? true,
x265,
@@ -43,12 +40,12 @@
withVPX ? true,
libvpx,
withQT ? true,
libsForQt5,
withCLI ? true,
default ? "qt5",
withPlugins ? true,
}:
assert withQT -> qttools != null && qtbase != null;
assert default != "qt5" -> default == "cli";
assert !withQT -> default != "qt5";
@@ -90,7 +87,7 @@ stdenv.mkDerivation rec {
cmake
pkg-config
makeWrapper
] ++ lib.optional withQT wrapQtAppsHook;
] ++ lib.optional withQT libsForQt5.wrapQtAppsHook;
buildInputs =
[
zlib
@@ -115,10 +112,13 @@ stdenv.mkDerivation rec {
++ lib.optional withPulse libpulseaudio
++ lib.optional withFAAD faad2
++ lib.optional withOpus libopus
++ lib.optionals withQT [
qttools
qtbase
]
++ lib.optionals withQT (
with libsForQt5;
[
qttools
qtbase
]
)
++ lib.optional withVPX libvpx;
dontWrapQtApps = true;
-2
View File
@@ -12972,8 +12972,6 @@ with pkgs;
ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { };
avidemux = libsForQt5.callPackage ../applications/video/avidemux { };
awesome = callPackage ../applications/window-managers/awesome {
cairo = cairo.override { xcbSupport = true; };
inherit (texFunctions) fontsConf;