diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-20 18:01:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-20 18:01:23 +0000 |
commit | 2f49e0bb89417e93394b43eb5e33aa1f3d2599e6 (patch) | |
tree | d11e6bb1c509db35f18d96870337c7221dd4c752 /pkgs/desktops | |
parent | 1edfa00d801f626b64c42301ede4e6f73e80f13a (diff) | |
parent | d4717ad12898f9c36f9b9538da0ca9df175ee05e (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index f785ee9165c00..ce17561d73fc1 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -3,8 +3,8 @@ extra-cmake-modules, kdoctools, - coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, - libXtst, libXft, pam, wayland, xmessage, xprop, xrdb, xsetroot, + coreutils, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, + libXtst, libXft, pam, wayland, xmessage, xsetroot, baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, @@ -62,10 +62,7 @@ mkDerivation { NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' - ''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"'' ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"'' - ''-DNIXPKGS_XPROP="${getBin xprop}/bin/xprop"'' - ''-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT="${getBin dbus}/bin/dbus-update-activation-environment"'' ''-DNIXPKGS_START_KDEINIT_WRAPPER="${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"'' ''-DNIXPKGS_KDEINIT5_SHUTDOWN="${getBin kinit}/bin/kdeinit5_shutdown"'' ]; |