kdePackages: clear out duplicate deps

This commit is contained in:
K900
2024-05-10 16:48:51 +03:00
parent 896763c240
commit 8af8158e07
16 changed files with 10 additions and 41 deletions

View File

@@ -5,7 +5,6 @@
ebook_tools, ebook_tools,
exiv2, exiv2,
ffmpeg, ffmpeg,
kcodecs,
kconfig, kconfig,
kdegraphics-mobipocket, kdegraphics-mobipocket,
libappimage, libappimage,
@@ -18,5 +17,5 @@ mkKdeDerivation {
patches = [./cmake-install-paths.patch]; patches = [./cmake-install-paths.patch];
extraNativeBuildInputs = [pkg-config]; extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kcodecs kconfig kdegraphics-mobipocket libappimage]; extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kconfig kdegraphics-mobipocket libappimage];
} }

View File

@@ -2,12 +2,11 @@
mkKdeDerivation, mkKdeDerivation,
qtwayland, qtwayland,
pkg-config, pkg-config,
wayland,
}: }:
mkKdeDerivation { mkKdeDerivation {
pname = "kguiaddons"; pname = "kguiaddons";
extraNativeBuildInputs = [pkg-config]; extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtwayland wayland]; extraBuildInputs = [qtwayland];
meta.mainProgram = "kde-geo-uri-handler"; meta.mainProgram = "kde-geo-uri-handler";
} }

View File

@@ -2,12 +2,11 @@
mkKdeDerivation, mkKdeDerivation,
qtwayland, qtwayland,
pkg-config, pkg-config,
wayland-protocols,
xorg, xorg,
}: }:
mkKdeDerivation { mkKdeDerivation {
pname = "kidletime"; pname = "kidletime";
extraNativeBuildInputs = [pkg-config]; extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtwayland xorg.libXScrnSaver wayland-protocols]; extraBuildInputs = [qtwayland xorg.libXScrnSaver];
} }

View File

@@ -4,11 +4,10 @@
qtdeclarative, qtdeclarative,
qtwayland, qtwayland,
pkg-config, pkg-config,
wayland,
}: }:
mkKdeDerivation { mkKdeDerivation {
pname = "kwindowsystem"; pname = "kwindowsystem";
extraNativeBuildInputs = [qttools pkg-config]; extraNativeBuildInputs = [qttools pkg-config];
extraBuildInputs = [qtdeclarative qtwayland wayland]; extraBuildInputs = [qtdeclarative qtwayland];
} }

View File

@@ -2,12 +2,10 @@
mkKdeDerivation, mkKdeDerivation,
qtdeclarative, qtdeclarative,
qttools, qttools,
sonnet,
}: }:
mkKdeDerivation { mkKdeDerivation {
pname = "qqc2-desktop-style"; pname = "qqc2-desktop-style";
extraNativeBuildInputs = [qttools]; extraNativeBuildInputs = [qttools];
extraBuildInputs = [qtdeclarative]; extraBuildInputs = [qtdeclarative];
extraPropagatedBuildInputs = [sonnet];
} }

View File

@@ -5,7 +5,6 @@
qtwebchannel, qtwebchannel,
qtwebengine, qtwebengine,
kitemmodels, kitemmodels,
kquickcharts,
}: }:
mkKdeDerivation { mkKdeDerivation {
pname = "arianna"; pname = "arianna";
@@ -16,7 +15,6 @@ mkKdeDerivation {
qtwebchannel qtwebchannel
qtwebengine qtwebengine
kitemmodels kitemmodels
kquickcharts
]; ];
meta.mainProgram = "arianna"; meta.mainProgram = "arianna";
} }

View File

@@ -10,8 +10,6 @@
kimageannotator, kimageannotator,
lcms2, lcms2,
libtiff, libtiff,
wayland,
wayland-protocols,
}: }:
mkKdeDerivation { mkKdeDerivation {
pname = "gwenview"; pname = "gwenview";
@@ -29,7 +27,5 @@ mkKdeDerivation {
kimageannotator kimageannotator
lcms2 lcms2
libtiff libtiff
wayland
wayland-protocols
]; ];
} }

View File

@@ -3,7 +3,6 @@
qtsvg, qtsvg,
qtmultimedia, qtmultimedia,
pkg-config, pkg-config,
qqc2-desktop-style,
taglib, taglib,
libvlc, libvlc,
}: }:
@@ -14,7 +13,6 @@ mkKdeDerivation {
extraBuildInputs = [ extraBuildInputs = [
qtsvg qtsvg
qtmultimedia qtmultimedia
qqc2-desktop-style
taglib taglib
libvlc libvlc
]; ];

View File

@@ -3,7 +3,6 @@
qt5compat, qt5compat,
qtsvg, qtsvg,
pkg-config, pkg-config,
libkexiv2,
samba, samba,
libssh, libssh,
libmtp, libmtp,
@@ -24,7 +23,6 @@ mkKdeDerivation {
extraBuildInputs = [ extraBuildInputs = [
qt5compat qt5compat
qtsvg qtsvg
libkexiv2
samba samba
libssh libssh

View File

@@ -7,7 +7,6 @@
qtsvg, qtsvg,
exiv2, exiv2,
kirigami-addons, kirigami-addons,
kquickimageeditor,
}: let }: let
# URLs snapshotted through # URLs snapshotted through
# https://web.archive.org/save/$url # https://web.archive.org/save/$url
@@ -41,7 +40,6 @@ in
qtsvg qtsvg
exiv2 exiv2
kirigami-addons kirigami-addons
kquickimageeditor
]; ];
meta.mainProgram = "koko"; meta.mainProgram = "koko";
} }

View File

@@ -3,8 +3,6 @@
mkKdeDerivation, mkKdeDerivation,
qtquick3d, qtquick3d,
qtsvg, qtsvg,
purpose,
qqc2-desktop-style,
pkg-config, pkg-config,
mpv-unwrapped, mpv-unwrapped,
yt-dlp, yt-dlp,
@@ -13,8 +11,7 @@ mkKdeDerivation {
pname = "plasmatube"; pname = "plasmatube";
extraNativeBuildInputs = [pkg-config]; extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtquick3d qtsvg mpv-unwrapped qqc2-desktop-style]; extraBuildInputs = [qtquick3d qtsvg mpv-unwrapped];
extraPropagatedBuildInputs = [purpose];
qtWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ yt-dlp ])]; qtWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ yt-dlp ])];
meta.mainProgram = "plasmatube"; meta.mainProgram = "plasmatube";

View File

@@ -1,10 +1,6 @@
{ {mkKdeDerivation}:
mkKdeDerivation,
plasma-activities-stats,
}:
mkKdeDerivation { mkKdeDerivation {
pname = "sweeper"; pname = "sweeper";
extraBuildInputs = [plasma-activities-stats];
meta.mainProgram = "sweeper"; meta.mainProgram = "sweeper";
} }

View File

@@ -6,13 +6,12 @@
qtwebsockets, qtwebsockets,
qtwebview, qtwebview,
mpv-unwrapped, mpv-unwrapped,
kitemmodels,
sonnet, sonnet,
}: }:
mkKdeDerivation { mkKdeDerivation {
pname = "tokodon"; pname = "tokodon";
extraNativeBuildInputs = [pkg-config]; extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtmultimedia qtsvg qtwebsockets qtwebview mpv-unwrapped kitemmodels sonnet]; extraBuildInputs = [qtmultimedia qtsvg qtwebsockets qtwebview mpv-unwrapped sonnet];
meta.mainProgram = "tokodon"; meta.mainProgram = "tokodon";
} }

View File

@@ -2,11 +2,10 @@
mkKdeDerivation, mkKdeDerivation,
pkg-config, pkg-config,
qtwayland, qtwayland,
wayland-protocols,
}: }:
mkKdeDerivation { mkKdeDerivation {
pname = "kwayland"; pname = "kwayland";
extraNativeBuildInputs = [pkg-config]; extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtwayland wayland-protocols]; extraBuildInputs = [qtwayland];
} }

View File

@@ -2,12 +2,10 @@
mkKdeDerivation, mkKdeDerivation,
qtwayland, qtwayland,
pkg-config, pkg-config,
wayland,
wayland-protocols,
}: }:
mkKdeDerivation { mkKdeDerivation {
pname = "layer-shell-qt"; pname = "layer-shell-qt";
extraNativeBuildInputs = [pkg-config]; extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtwayland wayland wayland-protocols]; extraBuildInputs = [qtwayland];
} }

View File

@@ -2,13 +2,11 @@
mkKdeDerivation, mkKdeDerivation,
pkg-config, pkg-config,
qtwayland, qtwayland,
wayland,
wayland-protocols,
cups, cups,
}: }:
mkKdeDerivation { mkKdeDerivation {
pname = "xdg-desktop-portal-kde"; pname = "xdg-desktop-portal-kde";
extraNativeBuildInputs = [pkg-config]; extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtwayland wayland wayland-protocols cups]; extraBuildInputs = [qtwayland cups];
} }