Merge pull request #73756 from FRidh/kde5

WIP KDE5: fix breakage due to set -u changes
This commit is contained in:
John Ericson 2019-11-24 15:10:34 -05:00 committed by GitHub
commit 10a0a23c4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -4,7 +4,7 @@
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
kwindowsystem, kxmlgui, qtscript, knewstuff
kwindowsystem, kxmlgui, qtscript, knewstuff, kglobalaccel
}:
mkDerivation {
@ -18,6 +18,7 @@ mkDerivation {
kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff
kglobalaccel
];
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdoctools, extra-cmake-modules,
karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications,
knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras
knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras, kglobalaccel
}:
mkDerivation {
@ -9,7 +9,7 @@ mkDerivation {
buildInputs = [
karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications
knotifyconfig kparts kwindowsystem qtx11extras
knotifyconfig kparts kwindowsystem qtx11extras kglobalaccel
];
propagatedBuildInputs = [