public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'plasma-workspace'

Browse Source
This commit is contained in:
Thomas Tuegel 2016-06-08 14:59:21 -05:00
commit bdb8bafd1f
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
View File

@ -1,7 +1,8 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig { plasmaPackage, extra-cmake-modules, kdoctools
, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n , kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
, kio, knewstuff, kross, krunner, kservice, kunitconversion , kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion
, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
, ibus
}: }:
plasmaPackage { plasmaPackage {
@ -11,8 +12,9 @@ plasmaPackage {
kdoctools kdoctools
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kdelibs4support kio kross krunner plasma-framework plasma-workspace kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
qtdeclarative qtx11extras ibus kconfig kconfigwidgets kcoreaddons kcmutils kross krunner kservice ksysguard kunitconversion plasma-framework
knewstuff kservice kunitconversion plasma-workspace qtdeclarative qtx11extras
ibus
]; ];
} }

6
pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
View File

@ -7,7 +7,7 @@
, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev , qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver , xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux , libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux
, qtquickcontrols , qtquickcontrols, ksysguard
}: }:
plasmaPackage rec { plasmaPackage rec {
@ -17,14 +17,14 @@ plasmaPackage rec {
kdoctools kdoctools
makeQtWrapper makeQtWrapper
]; ];
propagatedBuildInputs = [ buildInputs = [
attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff
knotifications knotifyconfig kwallet libcanberra_kde libXcursor knotifications knotifyconfig kwallet libcanberra_kde libXcursor
libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev
xf86inputsynaptics xkeyboard_config xinput baloo kactivities kauth xf86inputsynaptics xkeyboard_config xinput baloo kactivities kauth
kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner
kwin plasma-framework plasma-workspace qtdeclarative kwin plasma-framework plasma-workspace qtdeclarative
qtquickcontrols qtx11extras qtquickcontrols qtx11extras ksysguard
]; ];
patches = [ patches = [
./0001-qt-5.5-QML-import-paths.patch ./0001-qt-5.5-QML-import-paths.patch