Merge branch 'plasma-workspace-iso-codes'

This commit is contained in:
Thomas Tuegel 2016-06-08 10:27:08 -05:00
commit 719b8e6d4c

View File

@ -3,9 +3,9 @@
, baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative , baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative
, kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff , kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff
, knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland , knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland
, kwin, kxmlrpcclient, libdbusmenu, libkscreen, libksysguard, libSM, libXcursor , kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, phonon
, networkmanager-qt, pam, phonon, plasma-framework, qtquickcontrols , plasma-framework, qtquickcontrols, qtscript, qtx11extras, solid
, qtscript, qtx11extras, solid, wayland , isocodes, libdbusmenu, libSM, libXcursor, pam, wayland
}: }:
plasmaPackage { plasmaPackage {
@ -15,13 +15,13 @@ plasmaPackage {
extra-cmake-modules extra-cmake-modules
kdoctools kdoctools
]; ];
propagatedBuildInputs = [ buildInputs = [
baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland
kwin kxmlrpcclient libdbusmenu libkscreen libksysguard libSM libXcursor kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon
networkmanager-qt pam phonon plasma-framework qtquickcontrols plasma-framework qtquickcontrols qtscript qtx11extras solid
qtscript qtx11extras solid wayland isocodes libdbusmenu libSM libXcursor pam wayland
]; ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);