Merge branch 'plasma-workspace'

Changed files
+11 -9
pkgs
desktops
kde-5
plasma-5.6
+8 -6
pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
···
-
{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig
-
, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
-
, kio, knewstuff, kross, krunner, kservice, kunitconversion
, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
}:
plasmaPackage {
···
kdoctools
];
propagatedBuildInputs = [
-
kdelibs4support kio kross krunner plasma-framework plasma-workspace
-
qtdeclarative qtx11extras ibus kconfig kconfigwidgets kcoreaddons kcmutils
-
knewstuff 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 {
···
kdoctools
];
propagatedBuildInputs = [
+
kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
+
kross krunner kservice ksysguard kunitconversion plasma-framework
+
plasma-workspace qtdeclarative qtx11extras
+
ibus
];
}
+3 -3
pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
···
, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux
-
, qtquickcontrols
}:
plasmaPackage rec {
···
kdoctools
makeQtWrapper
];
-
propagatedBuildInputs = [
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
];
patches = [
./0001-qt-5.5-QML-import-paths.patch
···
, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux
+
, qtquickcontrols, ksysguard
}:
plasmaPackage rec {
···
kdoctools
makeQtWrapper
];
+
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 ksysguard
];
patches = [
./0001-qt-5.5-QML-import-paths.patch