diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-06-08 14:59:21 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-06-08 14:59:21 -0500 |
| commit | bdb8bafd1fb44b5d07fca8f4f2269ffbdf6df711 (patch) | |
| tree | 77810477204f15a0e0a1b52fc9f4b65aeaefdfad | |
| parent | ba096752329ef5d8755bdc6f938bba60b76d52b6 (diff) | |
| parent | 8dae2eddcfad999a7f8252e43789b0e78d66e6d1 (diff) | |
| download | nixlib-bdb8bafd1fb44b5d07fca8f4f2269ffbdf6df711.tar nixlib-bdb8bafd1fb44b5d07fca8f4f2269ffbdf6df711.tar.gz nixlib-bdb8bafd1fb44b5d07fca8f4f2269ffbdf6df711.tar.bz2 nixlib-bdb8bafd1fb44b5d07fca8f4f2269ffbdf6df711.tar.lz nixlib-bdb8bafd1fb44b5d07fca8f4f2269ffbdf6df711.tar.xz nixlib-bdb8bafd1fb44b5d07fca8f4f2269ffbdf6df711.tar.zst nixlib-bdb8bafd1fb44b5d07fca8f4f2269ffbdf6df711.zip | |
Merge branch 'plasma-workspace'
| -rw-r--r-- | pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix | 14 | ||||
| -rw-r--r-- | pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix index 570112e44804..3371e17beaf8 100644 --- a/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix @@ -1,7 +1,8 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig -, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n -, kio, knewstuff, kross, krunner, kservice, kunitconversion +{ plasmaPackage, extra-cmake-modules, kdoctools +, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n +, kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras +, ibus }: plasmaPackage { @@ -11,8 +12,9 @@ plasmaPackage { kdoctools ]; propagatedBuildInputs = [ - kdelibs4support kio kross krunner plasma-framework plasma-workspace - qtdeclarative qtx11extras ibus kconfig kconfigwidgets kcoreaddons kcmutils - knewstuff kservice kunitconversion + kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff + kross krunner kservice ksysguard kunitconversion plasma-framework + plasma-workspace qtdeclarative qtx11extras + ibus ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix index ca09e15bc44d..618e7387e62c 100644 --- a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix @@ -7,7 +7,7 @@ , qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev , xf86inputsynaptics, xinput, xkeyboard_config, xorgserver , libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux -, qtquickcontrols +, qtquickcontrols, ksysguard }: plasmaPackage rec { @@ -17,14 +17,14 @@ plasmaPackage rec { kdoctools makeQtWrapper ]; - propagatedBuildInputs = [ + buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff knotifications knotifyconfig kwallet libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput baloo kactivities kauth kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative - qtquickcontrols qtx11extras + qtquickcontrols qtx11extras ksysguard ]; patches = [ ./0001-qt-5.5-QML-import-paths.patch |