diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-21 15:59:20 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-25 19:04:24 -0500 |
| commit | 5896befee037fc570134cc75297a97fdad187fef (patch) | |
| tree | 91bb9337788be6f203c7d17aaec9bde4161d0a06 | |
| parent | 99c06657dfd220722dd3f70c3afcb23fc484f894 (diff) | |
| download | nixlib-5896befee037fc570134cc75297a97fdad187fef.tar nixlib-5896befee037fc570134cc75297a97fdad187fef.tar.gz nixlib-5896befee037fc570134cc75297a97fdad187fef.tar.bz2 nixlib-5896befee037fc570134cc75297a97fdad187fef.tar.lz nixlib-5896befee037fc570134cc75297a97fdad187fef.tar.xz nixlib-5896befee037fc570134cc75297a97fdad187fef.tar.zst nixlib-5896befee037fc570134cc75297a97fdad187fef.zip | |
nixos/kde5: install kactivitymanagerd
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/kde-5/plasma-5.6/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix | 14 |
3 files changed, 18 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index f5d9d8b8e0db..c81046ac4405 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -111,6 +111,9 @@ in # Install Breeze icons if available ++ lib.optional (lib.hasAttr "breeze-icons" kde5) kde5.breeze-icons + # Install activity manager if available + ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd + # Optional hardware support features ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix index 587d2cb520aa..1b777678515f 100644 --- a/pkgs/desktops/kde-5/plasma-5.6/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix @@ -53,6 +53,7 @@ let in symlinkJoin "breeze-${version}" (map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]); + kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; kde-gtk-config = callPackage ./kde-gtk-config {}; kdecoration = callPackage ./kdecoration.nix {}; diff --git a/pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix b/pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix new file mode 100644 index 000000000000..282e58ecf9e6 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix @@ -0,0 +1,14 @@ +{ plasmaPackage +, extra-cmake-modules +, boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel +, kwindowsystem, kxmlgui +}: + +plasmaPackage { + name = "kactivitymanagerd"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ + boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem + kxmlgui + ]; +} |