diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-15 00:03:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-15 00:03:07 +0000 |
| commit | 62370ea07d90fd2e76cbd322ee228a19264b2942 (patch) | |
| tree | 1e0fb875d5d4da24d8d898dfaa4133b37e1af1cb /pkgs/applications/kde | |
| parent | 879976f6853e154941c0894b9d8ac3fa332fba11 (diff) | |
| parent | 1d9483230a9d2d9ed8e9167cdb0f982fedc60e86 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/kde')
| -rw-r--r-- | pkgs/applications/kde/dolphin.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/kde/kio-extras.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index d5340eaf379e9..ad14f62d7c0f5 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -5,7 +5,7 @@ kcompletion, kconfig, kcoreaddons, kdbusaddons, kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, kparts, ktexteditor, kwindowsystem, phonon, solid, - kuserfeedback, wayland, qtwayland, qtx11extras + kuserfeedback, wayland, qtwayland, qtx11extras, qtimageformats }: mkDerivation { @@ -26,6 +26,7 @@ mkDerivation { kuserfeedback wayland qtwayland qtx11extras + qtimageformats ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index cb2ccbb22c180..880fba59b1cbe 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -3,7 +3,7 @@ exiv2, kactivities, kactivities-stats, karchive, kbookmarks, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdsoap, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, kpty, syntax-highlighting, libmtp, libssh, openexr, libtirpc, - ilmbase, phonon, qtsvg, samba, solid, gperf, taglib + ilmbase, phonon, qtsvg, samba, solid, gperf, taglib, libX11, libXcursor }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { exiv2 kactivities kactivities-stats karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kdsoap kguiaddons kdnssd kiconthemes ki18n kio khtml kpty syntax-highlighting libmtp libssh openexr libtirpc - phonon qtsvg samba solid gperf taglib + phonon qtsvg samba solid gperf taglib libX11 libXcursor ]; # org.kde.kmtpd5 DBUS service launches kiod5 binary from kio derivation, not from kio-extras |