Skip to content

WIP KDE5: fix breakage due to set -u changes #73756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ericson2314 merged 2 commits into from
Nov 24, 2019
Merged

WIP KDE5: fix breakage due to set -u changes #73756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7232ea4
konsole: add missing kglobalaccel
FRidh Nov 19, 2019
88dc84c
yakuake: add missing kglobalaccel
FRidh Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkgs/applications/kde/konsole.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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) ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/kde/yakuake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
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 {
name = "yakuake";

buildInputs = [
karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications
knotifyconfig kparts kwindowsystem qtx11extras
knotifyconfig kparts kwindowsystem qtx11extras kglobalaccel
];

propagatedBuildInputs = [
Expand Down