git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #79011 from ttuegel/update--plasma-5.17.5

Plasma 5.17.5

commit1a903be2dec52c675222bfdcb3d84798906ac8f6 authorThomas Tuegel <ttuegel@mailbox.org> dateThu 6 Feb 2020, 09:59 (7 years ago) parent9e8704127fc662
18 files changed+442−1296
maintainers/scripts/fetch-kde-qt.sh+2−1 nixos/modules/services/x11/desktop-managers/plasma5.nix+2−1 pkgs/desktops/plasma-5/fetch.sh+1−1 pkgs/desktops/plasma-5/kscreen.nix+6−6 pkgs/desktops/plasma-5/kwayland-integration.nix+2−2 pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch+25 pkgs/desktops/plasma-5/kwin/xwayland.patch → pkgs/desktops/plasma-5/kwin/0002-xwayland.patch+17−5 pkgs/desktops/plasma-5/kwin/default.nix+7−1 pkgs/desktops/plasma-5/kwin/follow-symlinks.patch−13 pkgs/desktops/plasma-5/kwin/no-setcap-install.patch−24 pkgs/desktops/plasma-5/kwin/series−3 pkgs/desktops/plasma-5/milou.nix+3−3 pkgs/desktops/plasma-5/plasma-browser-integration.nix+11−4 pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch+129 pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch+22 pkgs/desktops/plasma-5/plasma-workspace/default.nix+25−43 pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch−1008 pkgs/desktops/plasma-5/srcs.nix+190−181
maintainers/scripts/fetch-kde-qt.sh+2−1
@@ -28,7 +28,8 @@ find . -type f | while read src; do
2828done
2929
3030cat >"$SRCS" <<EOF
31−# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
31+# DO NOT EDIT! This file is generated automatically.
32+# Command: $0 $@
3233{ fetchurl, mirror }:
3334
3435{
nixos/modules/services/x11/desktop-managers/plasma5.nix+2−1
@@ -60,7 +60,7 @@ in
6060 -e '/^toolBarFont=/ s/,Regular$//'
6161 fi
6262
63− exec "${getBin plasma5.plasma-workspace}/bin/startkde"
63+ exec "${getBin plasma5.plasma-workspace}/bin/startplasma-x11"
6464 '';
6565 };
6666
@@ -137,6 +137,7 @@ in
137137 libkscreen
138138 libksysguard
139139 milou
140+ plasma-browser-integration
140141 plasma-integration
141142 polkit-kde-agent
142143 systemsettings
pkgs/desktops/plasma-5/fetch.sh+1−1
@@ -1 +1 @@
1−WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.5/ )
1+WGET_ARGS=( https://download.kde.org/stable/plasma/5.17.5/ )
pkgs/desktops/plasma-5/kscreen.nix+6−6
@@ -1,17 +1,17 @@
11{
22 mkDerivation,
33 extra-cmake-modules,
4− kconfig, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons,
5− kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, kwindowsystem,
6− kdeclarative, plasma-framework
4+ kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n,
5+ kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects,
6+ kwindowsystem, kdeclarative, plasma-framework
77}:
88
99mkDerivation {
1010 name = "kscreen";
1111 nativeBuildInputs = [ extra-cmake-modules ];
1212 buildInputs = [
13− kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui
14− libkscreen qtdeclarative qtgraphicaleffects kwindowsystem kdeclarative
15− plasma-framework
13+ kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
14+ kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects
15+ kwindowsystem kdeclarative plasma-framework
1616 ];
1717}
pkgs/desktops/plasma-5/kwayland-integration.nix+2−2
@@ -1,11 +1,11 @@
11{
22 mkDerivation,
33 extra-cmake-modules,
4− kidletime, kwayland, kwindowsystem, qtbase,
4+ kguiaddons, kidletime, kwayland, kwindowsystem, qtbase,
55}:
66
77mkDerivation {
88 name = "kwayland-integration";
99 nativeBuildInputs = [ extra-cmake-modules ];
10− buildInputs = [ kidletime kwindowsystem kwayland qtbase ];
10+ buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase ];
1111}
pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patchnew file+25
@@ -0,0 +1,25 @@
1+From 449896c45b23f50c168d8d2789832024c906ec36 Mon Sep 17 00:00:00 2001
2+From: Thomas Tuegel <ttuegel@mailbox.org>
3+Date: Mon, 27 Jan 2020 05:31:13 -0600
4+Subject: [PATCH 1/2] follow symlinks
5+
6+---
7+ plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +-
8+ 1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+diff --git a/plugins/kdecorations/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp
11+index fd723a8..fb95633 100644
12+--- a/plugins/kdecorations/aurorae/src/aurorae.cpp
13++++ b/plugins/kdecorations/aurorae/src/aurorae.cpp
14+@@ -211,7 +211,7 @@ void Helper::init()
15+ // so let's try to locate our plugin:
16+ QString pluginPath;
17+ for (const QString &path : m_engine->importPathList()) {
18+- QDirIterator it(path, QDirIterator::Subdirectories);
19++ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
20+ while (it.hasNext()) {
21+ it.next();
22+ QFileInfo fileInfo = it.fileInfo();
23+--
24+2.23.1
25+
pkgs/desktops/plasma-5/kwin/xwayland.patch → pkgs/desktops/plasma-5/kwin/0002-xwayland.patchrenamed+17−5
@@ -1,8 +1,17 @@
1−Index: kwin-5.15.5/xwl/xwayland.cpp
2−===================================================================
3−--- kwin-5.15.5.orig/xwl/xwayland.cpp
4−+++ kwin-5.15.5/xwl/xwayland.cpp
5−@@ -143,7 +143,7 @@ void Xwayland::init()
1+From d584b075d71c4486710c0bbed6d44038f2ff5075 Mon Sep 17 00:00:00 2001
2+From: Thomas Tuegel <ttuegel@mailbox.org>
3+Date: Mon, 27 Jan 2020 05:31:23 -0600
4+Subject: [PATCH 2/2] xwayland
5+
6+---
7+ xwl/xwayland.cpp | 2 +-
8+ 1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+diff --git a/xwl/xwayland.cpp b/xwl/xwayland.cpp
11+index 5f17d39..b4b69ba 100644
12+--- a/xwl/xwayland.cpp
13++++ b/xwl/xwayland.cpp
14+@@ -145,7 +145,7 @@ void Xwayland::init()
615
716 m_xwaylandProcess = new Process(this);
817 m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
@@ -11,3 +20,6 @@ Index: kwin-5.15.5/xwl/xwayland.cpp
1120 QProcessEnvironment env = m_app->processStartupEnvironment();
1221 env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
1322 env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM"));
23+--
24+2.23.1
25+
pkgs/desktops/plasma-5/kwin/default.nix+7−1
@@ -14,6 +14,9 @@
1414 plasma-framework, qtsensors, libcap, libdrm
1515}:
1616
17+# TODO (ttuegel): investigate qmlplugindump failure
18+# TODO (ttuegel): investigate gbm dependency
19+
1720mkDerivation {
1821 name = "kwin";
1922 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
@@ -30,7 +33,10 @@ mkDerivation {
3033 libcap libdrm
3134 ];
3235 outputs = [ "bin" "dev" "out" ];
33− patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
36+ patches = [
37+ ./0001-follow-symlinks.patch
38+ ./0002-xwayland.patch
39+ ];
3440 CXXFLAGS = [
3541 ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
3642 ];
pkgs/desktops/plasma-5/kwin/follow-symlinks.patchdeleted−13
@@ -1,13 +0,0 @@
1−Index: kwin-5.7.3/plugins/kdecorations/aurorae/src/aurorae.cpp
2−===================================================================
3−--- kwin-5.7.3.orig/plugins/kdecorations/aurorae/src/aurorae.cpp
4−+++ kwin-5.7.3/plugins/kdecorations/aurorae/src/aurorae.cpp
5−@@ -211,7 +211,7 @@ void Helper::init()
6− // so let's try to locate our plugin:
7− QString pluginPath;
8− for (const QString &path : m_engine->importPathList()) {
9−- QDirIterator it(path, QDirIterator::Subdirectories);
10−+ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
11− while (it.hasNext()) {
12− it.next();
13− QFileInfo fileInfo = it.fileInfo();
pkgs/desktops/plasma-5/kwin/no-setcap-install.patchdeleted−24
@@ -1,24 +0,0 @@
1−Dont set capabilities on kwin_wayland executable at build time
2−
3−This is handled by security.wrappers on NixOS
4−
5−diff --git a/CMakeLists.txt b/CMakeLists.txt
6−index 48cbcdbfe..93b410ed8 100644
7−--- a/CMakeLists.txt
8−+++ b/CMakeLists.txt
9−@@ -674,15 +674,6 @@ if (HAVE_LIBCAP)
10− endif()
11−
12− install(TARGETS kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS} )
13−-if (HAVE_LIBCAP)
14−- install(
15−- CODE "execute_process(
16−- COMMAND
17−- ${SETCAP_EXECUTABLE}
18−- CAP_SYS_NICE=+ep
19−- \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/kwin_wayland)"
20−- )
21−-endif()
22−
23− add_subdirectory(platformsupport)
24− add_subdirectory(plugins)
pkgs/desktops/plasma-5/kwin/seriesdeleted−3
@@ -1,3 +0,0 @@
1−follow-symlinks.patch
2−xwayland.patch
3−no-setcap-install.patch
pkgs/desktops/plasma-5/milou.nix+3−3
@@ -1,15 +1,15 @@
11{
22 mkDerivation,
33 extra-cmake-modules,
4− kcoreaddons, kdeclarative, ki18n, krunner, kservice, plasma-framework,
5− qtscript, qtdeclarative
4+ kcoreaddons, kdeclarative, ki18n, kitemmodels, krunner, kservice,
5+ plasma-framework, qtscript, qtdeclarative
66}:
77
88mkDerivation {
99 name = "milou";
1010 nativeBuildInputs = [ extra-cmake-modules ];
1111 buildInputs = [
12− kcoreaddons kdeclarative ki18n krunner kservice plasma-framework
12+ kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework
1313 qtdeclarative qtscript
1414 ];
1515}
pkgs/desktops/plasma-5/plasma-browser-integration.nix+11−4
@@ -1,11 +1,18 @@
1−{ mkDerivation, extra-cmake-modules, qtbase, kio, ki18n, kconfig
2−, kdbusaddons, knotifications, krunner, kwindowsystem, kactivities
1+{
2+ mkDerivation,
3+ extra-cmake-modules,
4+ qtbase,
5+ kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose,
6+ krunner, kwindowsystem, kactivities,
37}:
48
59mkDerivation {
610 name = "plasma-browser-integration";
711 nativeBuildInputs = [
8− extra-cmake-modules qtbase kio ki18n kconfig kdbusaddons
9− knotifications krunner kwindowsystem kactivities
12+ extra-cmake-modules
13+ ];
14+ buildInputs = [
15+ qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose
16+ krunner kwindowsystem kactivities
1017 ];
1118}
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patchnew file+129
@@ -0,0 +1,129 @@
1+From 1796822e4c97062b919a596ce13db68e2c46c7e8 Mon Sep 17 00:00:00 2001
2+From: Thomas Tuegel <ttuegel@mailbox.org>
3+Date: Tue, 28 Jan 2020 05:00:53 -0600
4+Subject: [PATCH 1/2] startkde
5+
6+---
7+ startkde/startplasma-waylandsession.cpp | 2 +-
8+ startkde/startplasma-x11.cpp | 2 +-
9+ startkde/startplasma.cpp | 32 ++++++++-----------------
10+ 3 files changed, 12 insertions(+), 24 deletions(-)
11+
12+diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
13+index 87c71c6..5fc5314 100644
14+--- a/startkde/startplasma-waylandsession.cpp
15++++ b/startkde/startplasma-waylandsession.cpp
16+@@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/)
17+ waitForKonqi();
18+ out << "startplasma-waylandsession: Shutting down...\n";
19+
20+- runSync(QStringLiteral("kdeinit5_shutdown"), {});
21++ runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {});
22+
23+ cleanupX11();
24+ out << "startplasma-waylandsession: Done.\n";
25+diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
26+index 3314b62..14cbe29 100644
27+--- a/startkde/startplasma-x11.cpp
28++++ b/startkde/startplasma-x11.cpp
29+@@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/)
30+
31+ out << "startkde: Shutting down...\n";
32+
33+- runSync(QStringLiteral("kdeinit5_shutdown"), {});
34++ runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {});
35+
36+ cleanupPlasmaEnvironment();
37+ cleanupX11();
38+diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
39+index e0f7004..8ac41fd 100644
40+--- a/startkde/startplasma.cpp
41++++ b/startkde/startplasma.cpp
42+@@ -34,7 +34,7 @@ QTextStream out(stderr);
43+ void messageBox(const QString &text)
44+ {
45+ out << text;
46+- runSync(QStringLiteral("xmessage"), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text});
47++ runSync(QStringLiteral(NIXPKGS_XMESSAGE), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text});
48+ }
49+
50+ QStringList allServices(const QLatin1String& prefix)
51+@@ -184,14 +184,6 @@ void runEnvironmentScripts()
52+ }
53+ }
54+ sourceFiles(scripts);
55+-
56+- // Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
57+- // The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
58+- // to set it to a list of paths *not* including the KDE prefix if it's not /usr or
59+- // /usr/local.
60+- if (!qEnvironmentVariableIsSet("XDG_DATA_DIRS")) {
61+- qputenv("XDG_DATA_DIRS", KDE_INSTALL_FULL_DATAROOTDIR ":/usr/share:/usr/local/share");
62+- }
63+ }
64+
65+
66+@@ -240,15 +232,15 @@ void setupX11()
67+ // If the user has overwritten fonts, the cursor font may be different now
68+ // so don't move this up.
69+
70+- runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
71+- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")});
72+- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")});
73++ runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
74++ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")});
75++ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")});
76+ }
77+
78+ void cleanupX11()
79+ {
80+- runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") });
81+- runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") });
82++ runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") });
83++ runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") });
84+ }
85+
86+ // TODO: Check if Necessary
87+@@ -265,11 +257,7 @@ bool syncDBusEnvironment()
88+ {
89+ int exitCode;
90+ // At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
91+- if (!QStandardPaths::findExecutable(QStringLiteral("dbus-update-activation-environment")).isEmpty()) {
92+- exitCode = runSync(QStringLiteral("dbus-update-activation-environment"), { QStringLiteral("--systemd"), QStringLiteral("--all") });
93+- } else {
94+- exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR "/ksyncdbusenv"), {});
95+- }
96++ exitCode = runSync(QStringLiteral(NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT), { QStringLiteral("--systemd"), QStringLiteral("--all") });
97+ return exitCode == 0;
98+ }
99+
100+@@ -285,7 +273,7 @@ void setupFontDpi()
101+ //TODO port to c++?
102+ const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
103+ QProcess p;
104+- p.start(QStringLiteral("xrdb"), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") });
105++ p.start(QStringLiteral(NIXPKGS_XRDB), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") });
106+ p.setProcessChannelMode(QProcess::ForwardedChannels);
107+ p.write(input);
108+ p.closeWriteChannel();
109+@@ -307,7 +295,7 @@ QProcess* setupKSplash()
110+ KConfigGroup ksplashCfg = cfg.group("KSplash");
111+ if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
112+ p = new QProcess;
113+- p->start(QStringLiteral("ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) });
114++ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) });
115+ }
116+ }
117+ return p;
118+@@ -329,7 +317,7 @@ bool startKDEInit()
119+ {
120+ // We set LD_BIND_NOW to increase the efficiency of kdeinit.
121+ // kdeinit unsets this variable before loading applications.
122+- const int exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), { QStringLiteral("--kded"), QStringLiteral("+kcminit_startup") }, { QStringLiteral("LD_BIND_NOW=true") });
123++ const int exitCode = runSync(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), { QStringLiteral("--kded"), QStringLiteral("+kcminit_startup") }, { QStringLiteral("LD_BIND_NOW=true") });
124+ if (exitCode != 0) {
125+ messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation."));
126+ return false;
127+--
128+2.23.1
129+
pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patchnew file+22
@@ -0,0 +1,22 @@
1+From 7c6f939aea290bc3ec7629f26d02441d1d4bcb8a Mon Sep 17 00:00:00 2001
2+From: Thomas Tuegel <ttuegel@mailbox.org>
3+Date: Wed, 5 Feb 2020 05:03:11 -0600
4+Subject: [PATCH 2/2] absolute-wallpaper-install-dir
5+
6+---
7+ sddm-theme/theme.conf.cmake | 2 +-
8+ 1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
11+index ea9a943..c8458ba 100644
12+--- a/sddm-theme/theme.conf.cmake
13++++ b/sddm-theme/theme.conf.cmake
14+@@ -2,4 +2,4 @@
15+ type=image
16+ color=#1d99f3
17+ fontSize=10
18+-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
19++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png
20+--
21+2.23.1
22+
pkgs/desktops/plasma-5/plasma-workspace/default.nix+25−43
@@ -6,12 +6,12 @@
66 coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor,
77 libXtst, pam, wayland, xmessage, xprop, xrdb, xsetroot,
88
9− baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
10− kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, kjsembed, knewstuff,
11− knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets,
12− kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate,
13− networkmanager-qt, phonon, plasma-framework, prison, solid, kholidays,
14− breeze-qt5,
9+ baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash,
10+ kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime,
11+ kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner,
12+ kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin,
13+ kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt,
14+ phonon, plasma-framework, prison, solid, kholidays,
1515
1616 qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
1717 qtwayland, qtx11extras,
@@ -26,11 +26,12 @@ mkDerivation {
2626 buildInputs = [
2727 isocodes libdbusmenu libSM libXcursor libXtst pam wayland
2828
29− baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
30− kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
31− knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets
32− kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate
33− networkmanager-qt phonon plasma-framework prison solid kholidays
29+ baloo kactivities kactivities-stats kcmutils kconfig kcrash kdbusaddons
30+ kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
31+ knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor
32+ ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
33+ libqalculate networkmanager-qt phonon plasma-framework prison solid
34+ kholidays
3435
3536 qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
3637 ];
@@ -38,41 +39,22 @@ mkDerivation {
3839 outputs = [ "out" "dev" ];
3940
4041 cmakeFlags = [
41− "-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage"
42− "-DNIXPKGS_MKDIR=${getBin coreutils}/bin/mkdir"
43− "-DNIXPKGS_XRDB=${getBin xrdb}/bin/xrdb"
44− "-DNIXPKGS_QTPATHS=${getBin qttools}/bin/qtpaths"
45− "-DNIXPKGS_XSETROOT=${getBin xsetroot}/bin/xsetroot"
46− "-DNIXPKGS_XPROP=${getBin xprop}/bin/xprop"
47− "-DNIXPKGS_ID=${getBin coreutils}/bin/id"
48− "-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT=${getBin dbus}/bin/dbus-update-activation-environment"
49− "-DNIXPKGS_START_KDEINIT_WRAPPER=${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"
50− "-DNIXPKGS_QDBUS=${getBin qttools}/bin/qdbus"
51− "-DNIXPKGS_KWRAPPER5=${getBin kinit}/bin/kwrapper5"
52− "-DNIXPKGS_KREADCONFIG5=${getBin kconfig}/bin/kreadconfig5"
53− "-DNIXPKGS_GREP=${getBin gnugrep}/bin/grep"
54− "-DNIXPKGS_KDEINIT5_SHUTDOWN=${getBin kinit}/bin/kdeinit5_shutdown"
55− "-DNIXPKGS_SED=${getBin gnused}/bin/sed"
56− "-DNIXPKGS_WALLPAPER_INSTALL_DIR=${getBin breeze-qt5}/share/wallpapers/"
42+ ''-DNIXPKGS_BREEZE_WALLPAPERS=${getBin breeze-qt5}/share/wallpapers''
5743 ];
5844
59− # To regenerate ./plasma-workspace.patch,
60− #
61− # > git clone https://github.com/ttuegel/plasma-workspace
62− # > cd plasma-workspace
63− # > git checkout nixpkgs/$x.$y # where $x.$y.$z == $version
64− # ... make some commits ...
65− # > git diff v$x.$y.$z
66− #
67− # Add upstream patches to the list below. For new patchs, particularly if not
68− # submitted upstream, please make a pull request and add it to
69− # ./plasma-workspace.patch.
7045 patches = [
71− ./plasma-workspace.patch
46+ ./0001-startkde.patch
47+ ./0002-absolute-wallpaper-install-dir.patch
7248 ];
7349
74− preConfigure = ''
75− NIX_CFLAGS_COMPILE+=" -DNIXPKGS_KDOSTARTUPCONFIG5=\"''${!outputBin}/bin/kdostartupconfig5\""
76− cmakeFlags+=" -DNIXPKGS_STARTPLASMA=''${!outputBin}/libexec/startplasma"
77− '';
50+
51+ NIX_CFLAGS_COMPILE = [
52+ ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"''
53+ ''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"''
54+ ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"''
55+ ''-DNIXPKGS_XPROP="${getBin xprop}/bin/xprop"''
56+ ''-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT="${getBin dbus}/bin/dbus-update-activation-environment"''
57+ ''-DNIXPKGS_START_KDEINIT_WRAPPER="${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"''
58+ ''-DNIXPKGS_KDEINIT5_SHUTDOWN="${getBin kinit}/bin/kdeinit5_shutdown"''
59+ ];
7860}
pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patchdeleted−1008
@@ -1,1008 +0,0 @@
1−diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
2−index ea9a943..f98ddd2 100644
3−--- a/sddm-theme/theme.conf.cmake
4−+++ b/sddm-theme/theme.conf.cmake
5−@@ -2,4 +2,4 @@
6− type=image
7− color=#1d99f3
8− fontSize=10
9−-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
10−+background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
11−diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
12−index 6a1a212..f03fd34 100644
13−--- a/startkde/CMakeLists.txt
14−+++ b/startkde/CMakeLists.txt
15−@@ -4,11 +4,6 @@ add_subdirectory(ksyncdbusenv)
16− add_subdirectory(waitforname)
17− add_subdirectory(kcheckrunning)
18−
19−-#FIXME: reconsider, looks fishy
20−-if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
21−- set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${KDE_INSTALL_FULL_DATAROOTDIR}/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
22−-endif()
23−-
24− configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY)
25− configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor @ONLY)
26− configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma @ONLY)
27−diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp
28−index 493218e..d507aa5 100644
29−--- a/startkde/kstartupconfig/kstartupconfig.cpp
30−+++ b/startkde/kstartupconfig/kstartupconfig.cpp
31−@@ -147,5 +147,5 @@ int main()
32− fclose( keys );
33− fclose( config );
34− doit:
35−- return system( "kdostartupconfig5" );
36−+ return system( NIXPKGS_KDOSTARTUPCONFIG5 );
37− }
38−diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
39−index b68f0c6..97a13a1 100644
40−--- a/startkde/startkde.cmake
41−+++ b/startkde/startkde.cmake
42−@@ -1,22 +1,31 @@
43− #!/bin/sh
44− #
45−-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
46−+# NIXPKGS KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
47− #
48−
49−+if test "x$1" = x--failsafe; then
50−+ KDE_FAILSAFE=1 # General failsafe flag
51−+ KWIN_COMPOSE=N # Disable KWin's compositing
52−+ QT_XCB_FORCE_SOFTWARE_OPENGL=1
53−+ export KWIN_COMPOSE KDE_FAILSAFE QT_XCB_FORCE_SOFTWARE_OPENGL
54−+fi
55−+
56− # When the X server dies we get a HUP signal from xinit. We must ignore it
57− # because we still need to do some cleanup.
58− trap 'echo GOT SIGHUP' HUP
59−
60−-# Check if a Plasma session already is running and whether it's possible to connect to X
61−-kcheckrunning
62−+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
63−+unset DYLD_FORCE_FLAT_NAMESPACE
64−+
65−+# Check if a KDE session already is running and whether it's possible to connect to X
66−+@CMAKE_INSTALL_FULL_BINDIR@/kcheckrunning
67− kcheckrunning_result=$?
68−-if test $kcheckrunning_result -eq 0 ; then
69−- echo "Plasma seems to be already running on this display."
70−- xmessage -geometry 500x100 "Plasma seems to be already running on this display." > /dev/null 2>/dev/null
71−- exit 1
72−-elif test $kcheckrunning_result -eq 2 ; then
73−- echo "\$DISPLAY is not set or cannot connect to the X server."
74−- exit 1
75−+if [ $kcheckrunning_result -eq 0 ]; then
76−+ echo "KDE seems to be already running on this display."
77−+ exit 1
78−+elif [ $kcheckrunning_result -eq 2 ]; then
79−+ echo "\$DISPLAY is not set or cannot connect to the X server."
80−+ exit 1
81− fi
82−
83− # Boot sequence:
84−@@ -33,62 +42,143 @@ fi
85− #
86− # * Then ksmserver is started which takes control of the rest of the startup sequence
87−
88−-if [ ${XDG_CONFIG_HOME} ]; then
89−- configDir=$XDG_CONFIG_HOME;
90−-else
91−- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
92−+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
93−+@NIXPKGS_MKDIR@ -p "$XDG_CONFIG_HOME"
94−+
95−+# The KDE icon cache is supposed to update itself
96−+# automatically, but it uses the timestamp on the icon
97−+# theme directory as a trigger. Since in Nix the
98−+# timestamp is always the same, this doesn't work. So as
99−+# a workaround, nuke the icon cache on login. This isn't
100−+# perfect, since it may require logging out after
101−+# installing new applications to update the cache.
102−+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
103−+rm -fv $HOME/.cache/icon-cache.kcache
104−+
105−+# xdg-desktop-settings generates this empty file but
106−+# it makes kbuildsyscoca5 fail silently. To fix this
107−+# remove that menu if it exists.
108−+rm -fv $HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu
109−+
110−+# Remove the kbuildsyscoca5 cache. It will be regenerated immediately after.
111−+# This is necessary for kbuildsyscoca5 to recognize that software that has been removed.
112−+rm -fv $HOME/.cache/ksycoca*
113−+
114−+# Qt writes a weird ‘libraryPath’ line to
115−+# ~/.config/Trolltech.conf that causes the KDE plugin
116−+# paths of previous KDE invocations to be searched.
117−+# Obviously using mismatching KDE libraries is potentially
118−+# disastrous, so here we nuke references to the Nix store
119−+# in Trolltech.conf. A better solution would be to stop
120−+# Qt from doing this wackiness in the first place.
121−+if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then
122−+ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf
123− fi
124− sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg}
125−
126−-# We need to create config folder so we can write startupconfigkeys
127−-mkdir -p $configDir
128−+@NIXPKGS_KBUILDSYCOCA5@
129−+
130−+# Set the default GTK 2 theme
131−+gtkrc2="$HOME/.gtkrc-2.0"
132−+breeze_gtkrc2="/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc"
133−+if ! [ -e "$gtkrc2" ] && [ -e "$breeze_gtkrc2" ]; then
134−+ cat >"$gtkrc2" <<EOF
135−+# Default GTK+ 2 config for NixOS KDE 5
136−+include "$breeze_gtkrc2"
137−+style "user-font"
138−+{
139−+ font_name="Sans Serif Regular"
140−+}
141−+widget_class "*" style "user-font"
142−+gtk-font-name="Sans Serif Regular 10"
143−+gtk-theme-name="Breeze"
144−+gtk-icon-theme-name="breeze"
145−+gtk-fallback-icon-theme="hicolor"
146−+gtk-cursor-theme-name="breeze_cursors"
147−+gtk-toolbar-style=GTK_TOOLBAR_ICONS
148−+gtk-menu-images=1
149−+gtk-button-images=1
150−+EOF
151−+fi
152−+
153−+# Set the default GTK 3 theme
154−+gtk3_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini"
155−+breeze_gtk3="/run/current-system/sw/share/themes/Breeze/gtk-3.0"
156−+if ! [ -e "$gtk3_settings" ] && [ -e "$breeze_gtk" ]; then
157−+ mkdir -p $(dirname "$gtk3_settings")
158−+ cat >"$gtk3_settings" <<EOF
159−+[Settings]
160−+gtk-font-name=Sans Serif Regular 10
161−+gtk-theme-name=Breeze
162−+gtk-icon-theme-name=breeze
163−+gtk-fallback-icon-theme=hicolor
164−+gtk-cursor-theme-name=breeze_cursors
165−+gtk-toolbar-style=GTK_TOOLBAR_ICONS
166−+gtk-menu-images=1
167−+gtk-button-images=1
168−+EOF
169−+fi
170−+
171−+kcminputrc="$XDG_CONFIG_HOME/kcminputrc"
172−+if ! [ -e "$kcminputrc" ]; then
173−+ cat >"$kcminputrc" <<EOF
174−+[Mouse]
175−+cursorTheme=breeze_cursors
176−+cursorSize=0
177−+EOF
178−+fi
179−
180− #This is basically setting defaults so we can use them with kstartupconfig5
181−-cat >$configDir/startupconfigkeys <<EOF
182−+cat >"$XDG_CONFIG_HOME/startupconfigkeys" <<EOF
183− kcminputrc Mouse cursorTheme 'breeze_cursors'
184− kcminputrc Mouse cursorSize ''
185−-ksplashrc KSplash Theme Breeze
186−+ksplashrc KSplash Theme org.kde.breeze.desktop
187− ksplashrc KSplash Engine KSplashQML
188− kdeglobals KScreen ScaleFactor ''
189− kdeglobals KScreen ScreenScaleFactors ''
190− kcmfonts General forceFontDPI 0
191−+kcmfonts General dontChangeAASettings true
192− EOF
193−
194− # preload the user's locale on first start
195−-plasmalocalerc=$configDir/plasma-localerc
196−-test -f $plasmalocalerc || {
197−-cat >$plasmalocalerc <<EOF
198−+plasmalocalerc="$XDG_CONFIG_HOME/plasma-localerc"
199−+if ! [ -f "$plasmalocalerc" ]; then
200−+ cat >"$plasmalocalerc" <<EOF
201− [Formats]
202− LANG=$LANG
203− EOF
204−-}
205−+fi
206−
207− # export LC_* variables set by kcmshell5 formats into environment
208− # so it can be picked up by QLocale and friends.
209−-exportformatssettings=$configDir/plasma-locale-settings.sh
210−-test -f $exportformatssettings && {
211−- . $exportformatssettings
212−-}
213−+exportformatssettings="$XDG_CONFIG_HOME/plasma-locale-settings.sh"
214−+if [ -r "$exportformatssettings" ]; then
215−+ . "$exportformatssettings"
216−+fi
217−
218− # Write a default kdeglobals file to set up the font
219−-kdeglobalsfile=$configDir/kdeglobals
220−-test -f $kdeglobalsfile || {
221−-cat >$kdeglobalsfile <<EOF
222−+kdeglobalsfile="$XDG_CONFIG_HOME/kdeglobals"
223−+if ! [ -f "$kdeglobalsfile" ]; then
224−+ cat >"$kdeglobalsfile" <<EOF
225− [General]
226−-XftAntialias=true
227−-XftHintStyle=hintmedium
228−-XftSubPixel=none
229−+fixed=Monospace,10,-1,5,50,0,0,0,0,0,Regular
230−+font=Sans Serif,10,-1,5,50,0,0,0,0,0,Regular
231−+menuFont=Sans Serif,10,-1,5,50,0,0,0,0,0,Regular
232−+smallestReadableFont=Sans Serif,8,-1,5,50,0,0,0,0,0,Regular
233−+toolBarFont=Sans Serif,8,-1,5,50,0,0,0,0,0,Regular
234−+
235−+[WM]
236−+activeFont=Noto Sans,12,-1,5,50,0,0,0,0,0,Bold
237− EOF
238−-}
239−+fi
240−
241−-kstartupconfig5
242−-returncode=$?
243−-if test $returncode -ne 0; then
244−- xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
245−+if ! @CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5; then
246−+ echo "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." 1>&2
247− exit 1
248− fi
249−-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
250−-
251−+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
252−+ . "$XDG_CONFIG_HOME/startupconfig"
253−+fi
254−
255− #Do not sync any of this section with the wayland versions as there scale factors are
256− #sent properly over wl_output
257−@@ -104,26 +194,33 @@ fi
258− #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
259− export QT_AUTO_SCREEN_SCALE_FACTOR=0
260−
261−+#Set the QtQuickControls style to our own: for QtQuickControls1
262−+#it will fall back to Desktop, while it will use our own org.kde.desktop
263−+#for QtQuickControlsStyle and Kirigami
264−+export QT_QUICK_CONTROLS_STYLE=org.kde.desktop
265−+
266−+XCURSOR_PATH=~/.icons
267−+IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
268−+for xdgDir in "${xdgDirs[@]}"; do
269−+ XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons"
270−+done
271−+export XCURSOR_PATH
272−+
273− # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
274− if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
275−- @EXPORT_XCURSOR_PATH@
276−-
277− kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
278−- if test $? -eq 10; then
279−- XCURSOR_THEME=breeze_cursors
280−- export XCURSOR_THEME
281−- elif test -n "$kcminputrc_mouse_cursortheme"; then
282−- XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
283−- export XCURSOR_THEME
284−+ if [ $? -eq 10 ]; then
285−+ export XCURSOR_THEME=breeze_cursors
286−+ elif [ -n "$kcminputrc_mouse_cursortheme" ]; then
287−+ export XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
288− fi
289−- if test -n "$kcminputrc_mouse_cursorsize"; then
290−- XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
291−- export XCURSOR_SIZE
292−+ if [ -n "$kcminputrc_mouse_cursorsize" ]; then
293−+ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
294− fi
295− fi
296−
297−-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
298−- xrdb -quiet -merge -nocpp <<EOF
299−+if [ "${kcmfonts_general_forcefontdpi:-0}" -ne 0 ]; then
300−+ @NIXPKGS_XRDB@ -quiet -merge -nocpp <<EOF
301− Xft.dpi: $kcmfonts_general_forcefontdpi
302− EOF
303− fi
304−@@ -132,11 +229,11 @@ dl=$DESKTOP_LOCKED
305− unset DESKTOP_LOCKED # Don't want it in the environment
306−
307− ksplash_pid=
308−-if test -z "$dl"; then
309−+if [ -z "$dl" ]; then
310− # the splashscreen and progress indicator
311− case "$ksplashrc_ksplash_engine" in
312− KSplashQML)
313−- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid`
314−+ ksplash_pid=$(@CMAKE_INSTALL_FULL_BINDIR@/ksplashqml "${ksplashrc_ksplash_theme}" --pid)
315− ;;
316− None)
317− ;;
318−@@ -145,27 +242,6 @@ if test -z "$dl"; then
319− esac
320− fi
321−
322−-# Source scripts found in <config locations>/plasma-workspace/env/*.sh
323−-# (where <config locations> correspond to the system and user's configuration
324−-# directory.
325−-#
326−-# This is where you can define environment variables that will be available to
327−-# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
328−-# or eval `gpg-agent --daemon`.
329−-# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
330−-#
331−-# (see end of this file).
332−-# For anything else (that doesn't set env vars, or that needs a window manager),
333−-# better use the Autostart folder.
334−-
335−-scriptpath=`echo "$configDir:$sysConfigDirs" | tr ':' '\n'`
336−-
337−-for prefix in `echo $scriptpath`; do
338−- for file in "$prefix"/plasma-workspace/env/*.sh; do
339−- test -r "$file" && . "$file" || true
340−- done
341−-done
342−-
343− # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
344− # from some users that they're confused and don't know what to do. This is
345− # especially necessary on slow machines, where starting KDE takes one or two
346−@@ -221,44 +297,65 @@ export XDG_DATA_DIRS
347− #
348− KDE_FULL_SESSION=true
349− export KDE_FULL_SESSION
350−-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
351−+@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
352−
353− KDE_SESSION_VERSION=5
354− export KDE_SESSION_VERSION
355−-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
356−+@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
357−
358−-KDE_SESSION_UID=`id -ru`
359−+KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru)
360− export KDE_SESSION_UID
361−
362− XDG_CURRENT_DESKTOP=KDE
363− export XDG_CURRENT_DESKTOP
364−
365−+# Enforce xcb QPA. Helps switching between Wayland and X sessions.
366−+export QT_QPA_PLATFORM=xcb
367−+
368−+# Source scripts found in <config locations>/plasma-workspace/env/*.sh
369−+# (where <config locations> correspond to the system and user's configuration
370−+# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
371−+# and /etc/xdg/ on Linux)
372−+#
373−+# This is where you can define environment variables that will be available to
374−+# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
375−+# or eval `gpg-agent --daemon`.
376−+# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
377−+#
378−+# (see end of this file).
379−+# For anything else (that doesn't set env vars, or that needs a window manager),
380−+# better use the Autostart folder.
381−+
382−+IFS=":" read -r -a scriptpath <<< $(@NIXPKGS_QTPATHS@ --paths GenericConfigLocation)
383−+# Add /env/ to the directory to locate the scripts to be sourced
384−+for prefix in "${scriptpath[@]}"; do
385−+ for file in "$prefix"/plasma-workspace/env/*.sh; do
386−+ if [ -r "$file" ]; then
387−+ . "$file"
388−+ fi
389−+ done
390−+done
391−+
392− # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
393−-if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
394−- dbus-update-activation-environment --systemd --all
395−-else
396−- @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
397−-fi
398−-if test $? -ne 0; then
399−+
400−+if ! @NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT@ --systemd --all; then
401− # Startup error
402− echo 'startkde: Could not sync environment to dbus.' 1>&2
403− test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
404−- xmessage -geometry 500x100 "Could not sync environment to dbus."
405− exit 1
406− fi
407−
408− # We set LD_BIND_NOW to increase the efficiency of kdeinit.
409− # kdeinit unsets this variable before loading applications.
410−-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
411−+LD_BIND_NOW=true @NIXPKGS_START_KDEINIT_WRAPPER@ --kded +kcminit_startup
412− if test $? -ne 0; then
413− # Startup error
414− echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2
415− test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
416−- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
417− exit 1
418− fi
419−
420−-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
421−+@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
422−
423− # finally, give the session control to the session manager
424− # see kdebase/ksmserver for the description of the rest of the startup sequence
425−@@ -270,12 +367,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
426− # We only check for 255 which means that the ksmserver process could not be
427− # started, any problems thereafter, e.g. ksmserver failing to initialize,
428− # will remain undetected.
429−-test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
430−+if [ -n "$KDEWM" ]; then
431−+ KDEWM="--windowmanager $KDEWM"
432−+fi
433− # If the session should be locked from the start (locked autologin),
434− # lock now and do the rest of the KDE startup underneath the locker.
435− KSMSERVEROPTIONS=""
436−-test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
437−-kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
438−+if [ -n "$dl" ]; then
439−+ KSMSERVEROPTIONS=" --lockscreen"
440−+fi
441−+@NIXPKGS_KWRAPPER5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
442− if test $? -eq 255; then
443− # Startup error
444− echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2
445−@@ -286,19 +387,19 @@ fi
446− #Anything after here is logout
447− #It is not called after shutdown/restart
448−
449−-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
450−+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
451−
452−-if test x"$wait_drkonqi"x = x"true"x ; then
453−+if [ x"$wait_drkonqi"x = x"true"x ]; then
454− # wait for remaining drkonqi instances with timeout (in seconds)
455−- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
456−+ wait_drkonqi_timeout=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900)
457− wait_drkonqi_counter=0
458−- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
459−+ while @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ -q "^[^w]*org.kde.drkonqi" ; do
460− sleep 5
461− wait_drkonqi_counter=$((wait_drkonqi_counter+5))
462−- if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
463−+ if [ "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ]; then
464− # ask remaining drkonqis to die in a graceful way
465−- qdbus | grep 'org.kde.drkonqi-' | while read address ; do
466−- qdbus "$address" "/MainApplication" "quit"
467−+ @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do
468−+ @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit"
469− done
470− break
471− fi
472−@@ -307,15 +408,17 @@ fi
473−
474− echo 'startkde: Shutting down...' 1>&2
475− # just in case
476−-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
477−+if [ -n "$ksplash_pid" ]; then
478−+ kill "$ksplash_pid" 2>/dev/null
479−+fi
480−
481− # Clean up
482−-kdeinit5_shutdown
483−+@NIXPKGS_KDEINIT5_SHUTDOWN@
484−
485− unset KDE_FULL_SESSION
486−-xprop -root -remove KDE_FULL_SESSION
487−+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
488− unset KDE_SESSION_VERSION
489−-xprop -root -remove KDE_SESSION_VERSION
490−+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
491− unset KDE_SESSION_UID
492−
493− echo 'startkde: Done.' 1>&2
494−diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
495−index 1fe41c5..11757df 100644
496−--- a/startkde/startplasma.cmake
497−+++ b/startkde/startplasma.cmake
498−@@ -1,6 +1,6 @@
499− #!/bin/sh
500− #
501−-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
502−+# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
503− #
504−
505− # Boot sequence:
506−@@ -17,28 +17,26 @@
507− #
508− # * Then ksmserver is started which takes control of the rest of the startup sequence
509−
510−-# We need to create config folder so we can write startupconfigkeys
511−-if [ ${XDG_CONFIG_HOME} ]; then
512−- configDir=$XDG_CONFIG_HOME;
513−-else
514−- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
515−+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
516−+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
517−+ . "$XDG_CONFIG_HOME/startupconfig"
518− fi
519−
520−-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
521−-
522−-xrdb -quiet -merge -nocpp <<EOF
523−+if [ "$kcmfonts_general_forcefontdpi" -ne 0 ]; then
524−+ @NIXPKGS_XRDB@ -quiet -merge -nocpp <<EOF
525− Xft.dpi: $QT_WAYLAND_FORCE_DPI
526− EOF
527−+fi
528−
529− dl=$DESKTOP_LOCKED
530− unset DESKTOP_LOCKED # Don't want it in the environment
531−
532− ksplash_pid=
533−-if test -z "$dl"; then
534−+if [ -z "$dl" ]; then
535− # the splashscreen and progress indicator
536− case "$ksplashrc_ksplash_engine" in
537− KSplashQML)
538−- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid`
539−+ ksplash_pid=$(@CMAKE_INSTALL_FULL_BINDIR@/ksplashqml "${ksplashrc_ksplash_theme}" --pid)
540− ;;
541− None)
542− ;;
543−@@ -58,23 +56,13 @@ export PLASMA_USE_QT_SCALING=1
544− # If the user has overwritten fonts, the cursor font may be different now
545− # so don't move this up.
546− #
547−-xsetroot -cursor_name left_ptr
548−-
549−-# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
550−-usr_fdir=$HOME/.fonts
551−-if test -n "$GS_LIB" ; then
552−- GS_LIB=$usr_fdir:$GS_LIB
553−- export GS_LIB
554−-else
555−- GS_LIB=$usr_fdir
556−- export GS_LIB
557−-fi
558−+@NIXPKGS_XSETROOT@ -cursor_name left_ptr
559−
560− echo 'startplasma: Starting up...' 1>&2
561−
562− # export our session variables to the Xwayland server
563−-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
564−-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
565−+@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
566−+@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
567−
568− # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
569− if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
570−@@ -90,16 +78,15 @@ fi
571−
572− # We set LD_BIND_NOW to increase the efficiency of kdeinit.
573− # kdeinit unsets this variable before loading applications.
574−-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
575−+LD_BIND_NOW=true @NIXPKGS_START_KDEINIT_WRAPPER@ --kded +kcminit_startup
576− if test $? -ne 0; then
577− # Startup error
578− echo 'startplasma: Could not start kdeinit5. Check your installation.' 1>&2
579− test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
580−- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
581− exit 1
582− fi
583−
584−-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
585−+@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
586−
587− # finally, give the session control to the session manager
588− # see kdebase/ksmserver for the description of the rest of the startup sequence
589−@@ -125,19 +112,19 @@ fi
590− #Anything after here is logout
591− #It is not called after shutdown/restart
592−
593−-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
594−+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
595−
596−-if test x"$wait_drkonqi"x = x"true"x ; then
597−+if [ x"$wait_drkonqi"x = x"true"x ]; then
598− # wait for remaining drkonqi instances with timeout (in seconds)
599−- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
600−+ wait_drkonqi_timeout=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900)
601− wait_drkonqi_counter=0
602−- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
603−+ while @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ -q "^[^w]*org.kde.drkonqi" ; do
604− sleep 5
605− wait_drkonqi_counter=$((wait_drkonqi_counter+5))
606−- if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
607−+ if [ "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ]; then
608− # ask remaining drkonqis to die in a graceful way
609−- qdbus | grep 'org.kde.drkonqi-' | while read address ; do
610−- qdbus "$address" "/MainApplication" "quit"
611−+ @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do
612−+ @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit"
613− done
614− break
615− fi
616−@@ -146,15 +133,17 @@ fi
617−
618− echo 'startplasma: Shutting down...' 1>&2
619− # just in case
620−-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
621−+if [ -n "$ksplash_pid" ]; then
622−+ "$ksplash_pid" 2>/dev/null
623−+fi
624−
625− # Clean up
626−-kdeinit5_shutdown
627−+@NIXPKGS_KDEINIT5_SHUTDOWN@
628−
629− unset KDE_FULL_SESSION
630−-xprop -root -remove KDE_FULL_SESSION
631−+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
632− unset KDE_SESSION_VERSION
633−-xprop -root -remove KDE_SESSION_VERSION
634−+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
635− unset KDE_SESSION_UID
636−
637− echo 'startplasma: Done.' 1>&2
638−diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
639−index dcb473a..0988740 100644
640−--- a/startkde/startplasmacompositor.cmake
641−+++ b/startkde/startplasmacompositor.cmake
642−@@ -1,118 +1,174 @@
643− #!/bin/sh
644− #
645−-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
646−+# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
647− #
648−
649−-# We need to create config folder so we can write startupconfigkeys
650−-if [ ${XDG_CONFIG_HOME} ]; then
651−- configDir=$XDG_CONFIG_HOME;
652−-else
653−- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
654−+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
655−+unset DYLD_FORCE_FLAT_NAMESPACE
656−+
657−+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
658−+@NIXPKGS_MKDIR@ -p "$XDG_CONFIG_HOME"
659−+
660−+# The KDE icon cache is supposed to update itself
661−+# automatically, but it uses the timestamp on the icon
662−+# theme directory as a trigger. Since in Nix the
663−+# timestamp is always the same, this doesn't work. So as
664−+# a workaround, nuke the icon cache on login. This isn't
665−+# perfect, since it may require logging out after
666−+# installing new applications to update the cache.
667−+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
668−+rm -fv $HOME/.cache/icon-cache.kcache
669−+
670−+# xdg-desktop-settings generates this empty file but
671−+# it makes kbuildsyscoca5 fail silently. To fix this
672−+# remove that menu if it exists.
673−+rm -fv $HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu
674−+
675−+# Remove the kbuildsyscoca5 cache. It will be regenerated immediately after.
676−+# This is necessary for kbuildsyscoca5 to recognize that software that has been removed.
677−+rm -fv $HOME/.cache/ksycoca*
678−+
679−+# Qt writes a weird ‘libraryPath’ line to
680−+# ~/.config/Trolltech.conf that causes the KDE plugin
681−+# paths of previous KDE invocations to be searched.
682−+# Obviously using mismatching KDE libraries is potentially
683−+# disastrous, so here we nuke references to the Nix store
684−+# in Trolltech.conf. A better solution would be to stop
685−+# Qt from doing this wackiness in the first place.
686−+if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then
687−+ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf
688−+fi
689−+
690−+@NIXPKGS_KBUILDSYCOCA5@
691−+
692−+# Set the default GTK 2 theme
693−+gtkrc2="$HOME/.gtkrc-2.0"
694−+breeze_gtkrc2="/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc"
695−+if ! [ -e "$gtkrc2" ] && [ -e "$breeze_gtkrc2" ]; then
696−+ cat >"$gtkrc2" <<EOF
697−+# Default GTK+ 2 config for NixOS KDE 5
698−+include "$breeze_gtkrc2"
699−+style "user-font"
700−+{
701−+ font_name="Sans Serif Regular"
702−+}
703−+widget_class "*" style "user-font"
704−+gtk-font-name="Sans Serif Regular 10"
705−+gtk-theme-name="Breeze"
706−+gtk-icon-theme-name="breeze"
707−+gtk-fallback-icon-theme="hicolor"
708−+gtk-cursor-theme-name="breeze_cursors"
709−+gtk-toolbar-style=GTK_TOOLBAR_ICONS
710−+gtk-menu-images=1
711−+gtk-button-images=1
712−+EOF
713− fi
714− sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg}
715−
716−-# We need to create config folder so we can write startupconfigkeys
717−-mkdir -p $configDir
718−+# Set the default GTK 3 theme
719−+gtk3_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini"
720−+breeze_gtk3="/run/current-system/sw/share/themes/Breeze/gtk-3.0"
721−+if ! [ -e "$gtk3_settings" ] && [ -e "$breeze_gtk" ]; then
722−+ mkdir -p $(dirname "$gtk3_settings")
723−+ cat >"$gtk3_settings" <<EOF
724−+[Settings]
725−+gtk-font-name=Sans Serif Regular 10
726−+gtk-theme-name=Breeze
727−+gtk-icon-theme-name=breeze
728−+gtk-fallback-icon-theme=hicolor
729−+gtk-cursor-theme-name=breeze_cursors
730−+gtk-toolbar-style=GTK_TOOLBAR_ICONS
731−+gtk-menu-images=1
732−+gtk-button-images=1
733−+EOF
734−+fi
735−+
736−+kcminputrc="$XDG_CONFIG_HOME/kcminputrc"
737−+if ! [ -e "$kcminputrc" ]; then
738−+ cat >"$kcminputrc" <<EOF
739−+[Mouse]
740−+cursorTheme=breeze_cursors
741−+cursorSize=0
742−+EOF
743−+fi
744−
745− #This is basically setting defaults so we can use them with kstartupconfig5
746−-cat >$configDir/startupconfigkeys <<EOF
747−+cat >"$XDG_CONFIG_HOME/startupconfigkeys" <<EOF
748− kcminputrc Mouse cursorTheme 'breeze_cursors'
749− kcminputrc Mouse cursorSize ''
750−-ksplashrc KSplash Theme Breeze
751−+ksplashrc KSplash Theme org.kde.breeze.desktop
752− ksplashrc KSplash Engine KSplashQML
753−-kcmfonts General forceFontDPIWayland 0
754−+kdeglobals KScreen ScreenScaleFactors ''
755−+kcmfonts General forceFontDPI 0
756−+kcmfonts General dontChangeAASettings true
757− EOF
758−
759− # preload the user's locale on first start
760−-plasmalocalerc=$configDir/plasma-localerc
761−-test -f $plasmalocalerc || {
762−-cat >$plasmalocalerc <<EOF
763−+plasmalocalerc="$XDG_CONFIG_HOME/plasma-localerc"
764−+if ! [ -f "$plasmalocalerc" ]; then
765−+ cat >"$plasmalocalerc" <<EOF
766− [Formats]
767− LANG=$LANG
768− EOF
769−-}
770−+fi
771−
772− # export LC_* variables set by kcmshell5 formats into environment
773− # so it can be picked up by QLocale and friends.
774−-exportformatssettings=$configDir/plasma-locale-settings.sh
775−-test -f $exportformatssettings && {
776−- . $exportformatssettings
777−-}
778−+exportformatssettings="$XDG_CONFIG_HOME/plasma-locale-settings.sh"
779−+if [ -r "$exportformatssettings" ]; then
780−+ . "$exportformatssettings"
781−+fi
782−
783− # Write a default kdeglobals file to set up the font
784−-kdeglobalsfile=$configDir/kdeglobals
785−-test -f $kdeglobalsfile || {
786−-cat >$kdeglobalsfile <<EOF
787−+kdeglobalsfile="$XDG_CONFIG_HOME/kdeglobals"
788−+if ! [ -f "$kdeglobalsfile" ]; then
789−+ cat >"$kdeglobalsfile" <<EOF
790− [General]
791−-XftAntialias=true
792−-XftHintStyle=hintmedium
793−-XftSubPixel=none
794−+fixed=Monospace,10,-1,5,50,0,0,0,0,0,Regular
795−+font=Sans Serif,10,-1,5,50,0,0,0,0,0,Regular
796−+menuFont=Sans Serif,10,-1,5,50,0,0,0,0,0,Regular
797−+smallestReadableFont=Sans Serif,8,-1,5,50,0,0,0,0,0,Regular
798−+toolBarFont=Sans Serif,8,-1,5,50,0,0,0,0,0,Regular
799−+
800−+[WM]
801−+activeFont=Noto Sans,12,-1,5,50,0,0,0,0,0,Bold
802− EOF
803−-}
804−-
805−-# Make sure the Oxygen font is installed
806−-# This is necessary for setups where CMAKE_INSTALL_PREFIX
807−-# is not in /usr. fontconfig looks in /usr, ~/.fonts and
808−-# $XDG_DATA_HOME for fonts. In this case, we symlink the
809−-# Oxygen font under ${XDG_DATA_HOME} and make it known to
810−-# fontconfig
811−-
812−-usr_share="/usr/share"
813−-install_share="@KDE_INSTALL_FULL_DATADIR@"
814−-
815−-if [ ! $install_share = $usr_share ]; then
816−-
817−- if [ ${XDG_DATA_HOME} ]; then
818−- fontsDir="${XDG_DATA_HOME}/fonts"
819−- else
820−- fontsDir="${HOME}/.fonts"
821−- fi
822−-
823−- test -d $fontsDir || {
824−- mkdir -p $fontsDir
825−- }
826−-
827−- oxygenDir=$fontsDir/truetype/oxygen
828−- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/truetype/oxygen"
829−-
830−- # if the oxygen dir doesn't exist, create a symlink to be sure that the
831−- # Oxygen font is available to the user
832−- test -d $oxygenDir || test -d $prefixDir && {
833−- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
834−- }
835− fi
836−
837−-kstartupconfig5
838−+@CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5
839− returncode=$?
840− if test $returncode -ne 0; then
841− exit 1
842− fi
843−-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
844−+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
845−+ . "$XDG_CONFIG_HOME/startupconfig"
846−+fi
847−
848− #Manually disable auto scaling because we are scaling above
849− #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output
850− export QT_AUTO_SCREEN_SCALE_FACTOR=0
851−
852−-# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
853−-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
854−- @EXPORT_XCURSOR_PATH@
855−+XCURSOR_PATH=~/.icons
856−+IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
857−+for xdgDir in "${xdgDirs[@]}"; do
858−+ XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons"
859−+done
860−+export XCURSOR_PATH
861−
862−- # TODO: is kapplymousetheme a core app?
863−+# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
864−+if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then
865− #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
866−- if test $? -eq 10; then
867−- XCURSOR_THEME=breeze_cursors
868−- export XCURSOR_THEME
869−- elif test -n "$kcminputrc_mouse_cursortheme"; then
870−- XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
871−- export XCURSOR_THEME
872−+ if [ $? -eq 10 ]; then
873−+ export XCURSOR_THEME=breeze_cursors
874−+ elif [ -n "$kcminputrc_mouse_cursortheme" ]; then
875−+ export XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
876− fi
877−- if test -n "$kcminputrc_mouse_cursorsize"; then
878−- XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
879−- export XCURSOR_SIZE
880−+ if [ -n "$kcminputrc_mouse_cursorsize" ]; then
881−+ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
882− fi
883− fi
884−
885−-if test "$kcmfonts_general_forcefontdpiwayland" -ne 0; then
886−+if [ "${kcmfonts_general_forcefontdpiwayland:-0}" -ne 0 ]; then
887− export QT_WAYLAND_FORCE_DPI=$kcmfonts_general_forcefontdpiwayland
888− else
889− export QT_WAYLAND_FORCE_DPI=96
890−@@ -120,12 +176,12 @@ fi
891−
892− # Get a property value from org.freedesktop.locale1
893− queryLocale1() {
894−- qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1"
895−+ @NIXPKGS_QDBUS@ --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1"
896− }
897−
898− # Query whether org.freedesktop.locale1 is available. If it is, try to
899− # set XKB_DEFAULT_{MODEL,LAYOUT,VARIANT,OPTIONS} accordingly.
900−-if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
901−+if @NIXPKGS_QDBUS@ --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
902− # Do not overwrite existing values. There is no point in setting only some
903− # of them as then they would not match anymore.
904− if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \
905−@@ -141,41 +197,10 @@ if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
906− fi
907− fi
908−
909−-# Source scripts found in <config locations>/plasma-workspace/env/*.sh
910−-# (where <config locations> correspond to the system and user's configuration
911−-# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
912−-# and /etc/xdg/ on Linux)
913−-#
914−-# This is where you can define environment variables that will be available to
915−-# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
916−-# or eval `gpg-agent --daemon`.
917−-# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
918−-#
919−-# (see end of this file).
920−-# For anything else (that doesn't set env vars, or that needs a window manager),
921−-# better use the Autostart folder.
922−-
923−-scriptpath=`echo "$configDir:$sysConfigDirs" | tr ':' '\n'`
924−-
925−-for prefix in `echo $scriptpath`; do
926−- for file in "$prefix"/plasma-workspace/env/*.sh; do
927−- test -r "$file" && . "$file" || true
928−- done
929−-done
930−-
931− echo 'startplasmacompositor: Starting up...' 1>&2
932−
933−-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
934−-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
935−-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
936−-# /usr/local.
937−-if test -z "$XDG_DATA_DIRS"; then
938−-XDG_DATA_DIRS="@KDE_INSTALL_FULL_DATADIR@:/usr/share:/usr/local/share"
939−-fi
940−-export XDG_DATA_DIRS
941−-
942− # Make sure that D-Bus is running
943−-if qdbus >/dev/null 2>/dev/null; then
944−+if @NIXPKGS_QDBUS@ >/dev/null 2>/dev/null; then
945− : # ok
946− else
947− echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2
948−@@ -212,7 +237,7 @@ export KDE_FULL_SESSION
949− KDE_SESSION_VERSION=5
950− export KDE_SESSION_VERSION
951−
952−-KDE_SESSION_UID=`id -ru`
953−+KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru)
954− export KDE_SESSION_UID
955−
956− XDG_CURRENT_DESKTOP=KDE
957−@@ -221,20 +246,41 @@ export XDG_CURRENT_DESKTOP
958− XDG_SESSION_TYPE=wayland
959− export XDG_SESSION_TYPE
960−
961−+# Source scripts found in <config locations>/plasma-workspace/env/*.sh
962−+# (where <config locations> correspond to the system and user's configuration
963−+# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
964−+# and /etc/xdg/ on Linux)
965−+#
966−+# This is where you can define environment variables that will be available to
967−+# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
968−+# or eval `gpg-agent --daemon`.
969−+# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
970−+#
971−+# (see end of this file).
972−+# For anything else (that doesn't set env vars, or that needs a window manager),
973−+# better use the Autostart folder.
974−+
975−+IFS=":" read -r -a scriptpath <<< $(@NIXPKGS_QTPATHS@ --paths GenericConfigLocation)
976−+# Add /env/ to the directory to locate the scripts to be sourced
977−+for prefix in "${scriptpath[@]}"; do
978−+ for file in "$prefix"/plasma-workspace/env/*.sh; do
979−+ if [ -r "$file" ]; then
980−+ . "$file"
981−+ fi
982−+ done
983−+done
984−+
985− # kwin_wayland can possibly also start dbus-activated services which need env variables.
986− # In that case, the update in startplasma might be too late.
987−-if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
988−- dbus-update-activation-environment --systemd --all
989−-else
990−- @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
991−-fi
992−-if test $? -ne 0; then
993−- # Startup error
994−- echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2
995−- exit 1
996−+if ! @NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT@ --systemd --all; then
997−+ # Startup error
998−+ echo 'startkde: Could not sync environment to dbus.' 1>&2
999−+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
1000−+ echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2
1001−+ exit 1
1002− fi
1003−
1004−-@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma
1005−+@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@NIXPKGS_STARTPLASMA@
1006−
1007− echo 'startplasmacompositor: Shutting down...' 1>&2
1008−
pkgs/desktops/plasma-5/srcs.nix+190−181
@@ -1,365 +1,374 @@
1−# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
1+# DO NOT EDIT! This file is generated automatically.
2+# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/
23{ fetchurl, mirror }:
34
45{
56 bluedevil = {
6− version = "5.16.5";
7+ version = "5.17.5";
78 src = fetchurl {
8− url = "${mirror}/stable/plasma/5.16.5/bluedevil-5.16.5.tar.xz";
9− sha256 = "60ac3471d30cb113b1959eacdaa1f4898f04f779f94a35dbca00993cda4ea464";
10− name = "bluedevil-5.16.5.tar.xz";
9+ url = "${mirror}/stable/plasma/5.17.5/bluedevil-5.17.5.tar.xz";
10+ sha256 = "22e9c683dfc56a559e652809ade238f8eb0ffb09d5ab042f5cd4b8216f647c09";
11+ name = "bluedevil-5.17.5.tar.xz";
1112 };
1213 };
1314 breeze = {
14− version = "5.16.5";
15+ version = "5.17.5";
1516 src = fetchurl {
16− url = "${mirror}/stable/plasma/5.16.5/breeze-5.16.5.tar.xz";
17− sha256 = "09225021a2cf396e74cabe692b0a5dcf9a12f0b47f02fb14df6ccc9db01f2e6b";
18− name = "breeze-5.16.5.tar.xz";
17+ url = "${mirror}/stable/plasma/5.17.5/breeze-5.17.5.tar.xz";
18+ sha256 = "f89bf857321b18789089efc9271d7bd7b6459a173dd078dd03242775db76c8d7";
19+ name = "breeze-5.17.5.tar.xz";
1920 };
2021 };
2122 breeze-grub = {
22− version = "5.16.5";
23+ version = "5.17.5";
2324 src = fetchurl {
24− url = "${mirror}/stable/plasma/5.16.5/breeze-grub-5.16.5.tar.xz";
25− sha256 = "ce73297350e7b79b04aa8ba44594e8eca2d37c0342eb331bd5d31679f3887878";
26− name = "breeze-grub-5.16.5.tar.xz";
25+ url = "${mirror}/stable/plasma/5.17.5/breeze-grub-5.17.5.tar.xz";
26+ sha256 = "591a1d7a510c76a1f2729a61a4d14c0f33db4d1e8ea5dbc87b74f2e7e7e2a2ba";
27+ name = "breeze-grub-5.17.5.tar.xz";
2728 };
2829 };
2930 breeze-gtk = {
30− version = "5.16.5";
31+ version = "5.17.5";
3132 src = fetchurl {
32− url = "${mirror}/stable/plasma/5.16.5/breeze-gtk-5.16.5.tar.xz";
33− sha256 = "d9849ecf6c2fc85fde76912410ab36c46ca65b96d80b4e51819ca35015a88098";
34− name = "breeze-gtk-5.16.5.tar.xz";
33+ url = "${mirror}/stable/plasma/5.17.5/breeze-gtk-5.17.5.tar.xz";
34+ sha256 = "6dbd8e7d936840fbaf7016574d07729c9d0791711ad6d371136585ddb8f76e66";
35+ name = "breeze-gtk-5.17.5.tar.xz";
3536 };
3637 };
3738 breeze-plymouth = {
38− version = "5.16.5";
39+ version = "5.17.5";
3940 src = fetchurl {
40− url = "${mirror}/stable/plasma/5.16.5/breeze-plymouth-5.16.5.tar.xz";
41− sha256 = "bb10d2f0185181e6f2fe8e3b85415dfcce6069595e0074b182688c6f567dd0b0";
42− name = "breeze-plymouth-5.16.5.tar.xz";
41+ url = "${mirror}/stable/plasma/5.17.5/breeze-plymouth-5.17.5.tar.xz";
42+ sha256 = "e95f9eaf04e74383f5e1abe74d999787e408be7a34fd07a4f64e253e35150af0";
43+ name = "breeze-plymouth-5.17.5.tar.xz";
4344 };
4445 };
4546 discover = {
46− version = "5.16.5";
47+ version = "5.17.5";
4748 src = fetchurl {
48− url = "${mirror}/stable/plasma/5.16.5/discover-5.16.5.tar.xz";
49− sha256 = "26c47a5c0f59a31f37da85e894a926c76805b66f91dde8ba6d2de8015842d5c1";
50− name = "discover-5.16.5.tar.xz";
49+ url = "${mirror}/stable/plasma/5.17.5/discover-5.17.5.tar.xz";
50+ sha256 = "986ef367aef59c5a956d4163f987a60cfd3674a300880376ddedc0222769789f";
51+ name = "discover-5.17.5.tar.xz";
5152 };
5253 };
5354 drkonqi = {
54− version = "5.16.5";
55+ version = "5.17.5";
5556 src = fetchurl {
56− url = "${mirror}/stable/plasma/5.16.5/drkonqi-5.16.5.tar.xz";
57− sha256 = "b4ae1518108c2d3ccbc533708801b52b83b7e9efd6eed9f1ee9d67936b9e78ff";
58− name = "drkonqi-5.16.5.tar.xz";
57+ url = "${mirror}/stable/plasma/5.17.5/drkonqi-5.17.5.tar.xz";
58+ sha256 = "756c50f2458a8c564e608ea97244f6b2b3d5fb4a675a8cec29307be1d5ab5457";
59+ name = "drkonqi-5.17.5.tar.xz";
5960 };
6061 };
6162 kactivitymanagerd = {
62− version = "5.16.5";
63+ version = "5.17.5";
6364 src = fetchurl {
64− url = "${mirror}/stable/plasma/5.16.5/kactivitymanagerd-5.16.5.tar.xz";
65− sha256 = "e35dbf7aae8a7b7f21b2304935cad96881af558a7c9d947f0114093038b1c4bc";
66− name = "kactivitymanagerd-5.16.5.tar.xz";
65+ url = "${mirror}/stable/plasma/5.17.5/kactivitymanagerd-5.17.5.tar.xz";
66+ sha256 = "362721c3a9712751fba29cd1f1ef440a1e74561a611f2d171692a4ddc895b3e4";
67+ name = "kactivitymanagerd-5.17.5.tar.xz";
6768 };
6869 };
6970 kde-cli-tools = {
70− version = "5.16.5";
71+ version = "5.17.5";
7172 src = fetchurl {
72− url = "${mirror}/stable/plasma/5.16.5/kde-cli-tools-5.16.5.tar.xz";
73− sha256 = "bc82b159d3c9a23f0ecb47a8314b645041b01692887a3be0ef0582d54f926de2";
74− name = "kde-cli-tools-5.16.5.tar.xz";
73+ url = "${mirror}/stable/plasma/5.17.5/kde-cli-tools-5.17.5.tar.xz";
74+ sha256 = "d14299ebeaf89854cb89435cfaaa4da1d84bf23a97df23ff8c7f95dae5bec55f";
75+ name = "kde-cli-tools-5.17.5.tar.xz";
7576 };
7677 };
7778 kdecoration = {
78− version = "5.16.5";
79+ version = "5.17.5";
7980 src = fetchurl {
80− url = "${mirror}/stable/plasma/5.16.5/kdecoration-5.16.5.tar.xz";
81− sha256 = "2b8c7b7cf114d0eff4ec842009cda264d8cf1254ec4bf65868b6d26f263829bb";
82− name = "kdecoration-5.16.5.tar.xz";
81+ url = "${mirror}/stable/plasma/5.17.5/kdecoration-5.17.5.tar.xz";
82+ sha256 = "7d8f0128306d436aeba010e47a3dddbcb9fb9fd05ef9308cbad1934914875cd9";
83+ name = "kdecoration-5.17.5.tar.xz";
8384 };
8485 };
8586 kde-gtk-config = {
86− version = "5.16.5";
87+ version = "5.17.5";
8788 src = fetchurl {
88− url = "${mirror}/stable/plasma/5.16.5/kde-gtk-config-5.16.5.tar.xz";
89− sha256 = "f78abf129aaa7afac2c7a71105b36b9553a975bbcb89ec65a0166099d1cca8c1";
90− name = "kde-gtk-config-5.16.5.tar.xz";
89+ url = "${mirror}/stable/plasma/5.17.5/kde-gtk-config-5.17.5.tar.xz";
90+ sha256 = "5feff23c756f1fb0ba9ab88c2aed92c0e7c5521c757f5a0cdd057273538f0010";
91+ name = "kde-gtk-config-5.17.5.tar.xz";
9192 };
9293 };
9394 kdeplasma-addons = {
94− version = "5.16.5";
95+ version = "5.17.5";
9596 src = fetchurl {
96− url = "${mirror}/stable/plasma/5.16.5/kdeplasma-addons-5.16.5.tar.xz";
97− sha256 = "a4737a54b75143053a9f8a5bc28c608f843c524872c665d4e5a65bd2853e1e00";
98− name = "kdeplasma-addons-5.16.5.tar.xz";
97+ url = "${mirror}/stable/plasma/5.17.5/kdeplasma-addons-5.17.5.tar.xz";
98+ sha256 = "997d6a3542ab1f1fd7fb17580693dc8281ff29b03c82577dbae3fc1ec4cccdb8";
99+ name = "kdeplasma-addons-5.17.5.tar.xz";
99100 };
100101 };
101102 kgamma5 = {
102− version = "5.16.5";
103+ version = "5.17.5";
103104 src = fetchurl {
104− url = "${mirror}/stable/plasma/5.16.5/kgamma5-5.16.5.tar.xz";
105− sha256 = "838fabf4312f022ee3df5bba940c0c73e26260cfee39235c1ba8da8a2e61bfa0";
106− name = "kgamma5-5.16.5.tar.xz";
105+ url = "${mirror}/stable/plasma/5.17.5/kgamma5-5.17.5.tar.xz";
106+ sha256 = "3b8fd1539d035d4d39dcde6ca0dd214e6653c98778ac79b9cbf2f7009b155ca9";
107+ name = "kgamma5-5.17.5.tar.xz";
107108 };
108109 };
109110 khotkeys = {
110− version = "5.16.5";
111+ version = "5.17.5";
111112 src = fetchurl {
112− url = "${mirror}/stable/plasma/5.16.5/khotkeys-5.16.5.tar.xz";
113− sha256 = "e7b866b5249ff7c5860a5a222dca79691ca1f09af176f786021fbbadbd718c8c";
114− name = "khotkeys-5.16.5.tar.xz";
113+ url = "${mirror}/stable/plasma/5.17.5/khotkeys-5.17.5.tar.xz";
114+ sha256 = "cf78b5bfb8568fb4eea592b209bdb79aeac92bd08a580c3b6c08d45dd34a2d56";
115+ name = "khotkeys-5.17.5.tar.xz";
115116 };
116117 };
117118 kinfocenter = {
118− version = "5.16.5";
119+ version = "5.17.5";
119120 src = fetchurl {
120− url = "${mirror}/stable/plasma/5.16.5/kinfocenter-5.16.5.tar.xz";
121− sha256 = "e3bbc5e2baedf35dc8750c99e18c115b651f2665218a105c08177bc5250eb9b1";
122− name = "kinfocenter-5.16.5.tar.xz";
121+ url = "${mirror}/stable/plasma/5.17.5/kinfocenter-5.17.5.tar.xz";
122+ sha256 = "679870f10ee6494136d87a897a57a23c2905054d7a83ff11a4e85c204eb9fd9a";
123+ name = "kinfocenter-5.17.5.tar.xz";
123124 };
124125 };
125126 kmenuedit = {
126− version = "5.16.5";
127+ version = "5.17.5";
127128 src = fetchurl {
128− url = "${mirror}/stable/plasma/5.16.5/kmenuedit-5.16.5.tar.xz";
129− sha256 = "8e95b81b910e5e78689fc7d4427c813ba7d39426df24cf8606adb850913a19a4";
130− name = "kmenuedit-5.16.5.tar.xz";
129+ url = "${mirror}/stable/plasma/5.17.5/kmenuedit-5.17.5.tar.xz";
130+ sha256 = "59beed03298cd9fd6b05d67844794ed6a77be0d1b25b55d5bbcdf72e15e357de";
131+ name = "kmenuedit-5.17.5.tar.xz";
131132 };
132133 };
133134 kscreen = {
134− version = "5.16.5";
135+ version = "5.17.5";
135136 src = fetchurl {
136− url = "${mirror}/stable/plasma/5.16.5/kscreen-5.16.5.tar.xz";
137− sha256 = "ce35f554014cee819767180f0c9381d539e497edfb9c290b279fa78e9dea4bb0";
138− name = "kscreen-5.16.5.tar.xz";
137+ url = "${mirror}/stable/plasma/5.17.5/kscreen-5.17.5.tar.xz";
138+ sha256 = "de8a00b33d0254245a53a5c097347aa86709d415754b3e3c675eef8fb4fe5bc0";
139+ name = "kscreen-5.17.5.tar.xz";
139140 };
140141 };
141142 kscreenlocker = {
142− version = "5.16.5";
143+ version = "5.17.5";
143144 src = fetchurl {
144− url = "${mirror}/stable/plasma/5.16.5/kscreenlocker-5.16.5.tar.xz";
145− sha256 = "5ed6fdeac9aaba014edf67c5f782fc210d58310d083afaa589d0ff1bb3e8e02d";
146− name = "kscreenlocker-5.16.5.tar.xz";
145+ url = "${mirror}/stable/plasma/5.17.5/kscreenlocker-5.17.5.tar.xz";
146+ sha256 = "078cfaa9f117a985f5c71152bdf4a9f5cb65ef23c0090cfaaccc9539770f138f";
147+ name = "kscreenlocker-5.17.5.tar.xz";
147148 };
148149 };
149150 ksshaskpass = {
150− version = "5.16.5";
151+ version = "5.17.5";
151152 src = fetchurl {
152− url = "${mirror}/stable/plasma/5.16.5/ksshaskpass-5.16.5.tar.xz";
153− sha256 = "78eaa38ebbf888a8905e9385173e7161335041d6d07720283ce6f3fa06426a33";
154− name = "ksshaskpass-5.16.5.tar.xz";
153+ url = "${mirror}/stable/plasma/5.17.5/ksshaskpass-5.17.5.tar.xz";
154+ sha256 = "b09e0d780340fc5a6a65e67a30d08a3f117f31e2dbfbb35579aa4cefb15c3b27";
155+ name = "ksshaskpass-5.17.5.tar.xz";
155156 };
156157 };
157158 ksysguard = {
158− version = "5.16.5";
159+ version = "5.17.5";
159160 src = fetchurl {
160− url = "${mirror}/stable/plasma/5.16.5/ksysguard-5.16.5.tar.xz";
161− sha256 = "5558977389cb1fac4a5ce52c9430b27d9d1ee92705ae1995d92bed5340477282";
162− name = "ksysguard-5.16.5.tar.xz";
161+ url = "${mirror}/stable/plasma/5.17.5/ksysguard-5.17.5.tar.xz";
162+ sha256 = "69bc12311dcf363b168a259139d30456ed395ec03b948bd35e992300c7e7bd82";
163+ name = "ksysguard-5.17.5.tar.xz";
163164 };
164165 };
165166 kwallet-pam = {
166− version = "5.16.5";
167+ version = "5.17.5";
167168 src = fetchurl {
168− url = "${mirror}/stable/plasma/5.16.5/kwallet-pam-5.16.5.tar.xz";
169− sha256 = "4a12a8ed51973f9ea318a39a699523bcc99ae4e1cac932fccd19dedd45e758a8";
170− name = "kwallet-pam-5.16.5.tar.xz";
169+ url = "${mirror}/stable/plasma/5.17.5/kwallet-pam-5.17.5.tar.xz";
170+ sha256 = "c829c7a44408e58beb87c71f5c70bccd349d285c3fcefb16df98bf2f29357fe9";
171+ name = "kwallet-pam-5.17.5.tar.xz";
171172 };
172173 };
173174 kwayland-integration = {
174− version = "5.16.5";
175+ version = "5.17.5";
175176 src = fetchurl {
176− url = "${mirror}/stable/plasma/5.16.5/kwayland-integration-5.16.5.tar.xz";
177− sha256 = "63724ecfb6db053ee949273979b393192309dbeed45b59bc193a605f90232282";
178− name = "kwayland-integration-5.16.5.tar.xz";
177+ url = "${mirror}/stable/plasma/5.17.5/kwayland-integration-5.17.5.tar.xz";
178+ sha256 = "818b4e14611e26f297ef60427d399edc458a44e113bc092390fa65ecababcedb";
179+ name = "kwayland-integration-5.17.5.tar.xz";
179180 };
180181 };
181182 kwin = {
182− version = "5.16.5";
183+ version = "5.17.5";
183184 src = fetchurl {
184− url = "${mirror}/stable/plasma/5.16.5/kwin-5.16.5.tar.xz";
185− sha256 = "7ff0e114e323ff7e10d78a157f8242b1d3cfa03967898d9e3fd3c039b7c9918b";
186− name = "kwin-5.16.5.tar.xz";
185+ url = "${mirror}/stable/plasma/5.17.5/kwin-5.17.5.tar.xz";
186+ sha256 = "8517adaf8270d783aea7b3886d86b5abed6a5ec2b5c78b632479597d956baadc";
187+ name = "kwin-5.17.5.tar.xz";
187188 };
188189 };
189190 kwrited = {
190− version = "5.16.5";
191+ version = "5.17.5";
191192 src = fetchurl {
192− url = "${mirror}/stable/plasma/5.16.5/kwrited-5.16.5.tar.xz";
193− sha256 = "4b122099b0a362fc409b50b7523689ba8a112508dad26f58753c6b648e7c5313";
194− name = "kwrited-5.16.5.tar.xz";
193+ url = "${mirror}/stable/plasma/5.17.5/kwrited-5.17.5.tar.xz";
194+ sha256 = "ca22b1fa3e657fa2e58bf0c9dc1ebff3be8c0e003750223e7a7c5932d5b90823";
195+ name = "kwrited-5.17.5.tar.xz";
195196 };
196197 };
197198 libkscreen = {
198− version = "5.16.5";
199+ version = "5.17.5";
199200 src = fetchurl {
200− url = "${mirror}/stable/plasma/5.16.5/libkscreen-5.16.5.tar.xz";
201− sha256 = "fd2d1e849315ac745ecfe757d6b2c5cc6486e0be5397f686dae3916c0252c938";
202− name = "libkscreen-5.16.5.tar.xz";
201+ url = "${mirror}/stable/plasma/5.17.5/libkscreen-5.17.5.tar.xz";
202+ sha256 = "aa186e5751287701daec4d036aba776a911e4b84ca7eea44dc5fb531875afd94";
203+ name = "libkscreen-5.17.5.tar.xz";
203204 };
204205 };
205206 libksysguard = {
206− version = "5.16.5";
207+ version = "5.17.5";
207208 src = fetchurl {
208− url = "${mirror}/stable/plasma/5.16.5/libksysguard-5.16.5.tar.xz";
209− sha256 = "f09b99737a937df890ecdd2a33720b6cba3c79fc8bc17ef1470572748a6e1976";
210− name = "libksysguard-5.16.5.tar.xz";
209+ url = "${mirror}/stable/plasma/5.17.5/libksysguard-5.17.5.tar.xz";
210+ sha256 = "f5d237af554d65740a28360e6d8fa39d4912239c5f21288846b1c934897a7e14";
211+ name = "libksysguard-5.17.5.tar.xz";
211212 };
212213 };
213214 milou = {
214− version = "5.16.5";
215+ version = "5.17.5";
215216 src = fetchurl {
216− url = "${mirror}/stable/plasma/5.16.5/milou-5.16.5.tar.xz";
217− sha256 = "bfcdba29262dda9f386ee99132053ad5751194b2df8219899fcbb0b3699afcd5";
218− name = "milou-5.16.5.tar.xz";
217+ url = "${mirror}/stable/plasma/5.17.5/milou-5.17.5.tar.xz";
218+ sha256 = "b89796e34cc8b6d6d4196169e814249f7b75c1c15763e0b4c1da5c97ccc2c8cf";
219+ name = "milou-5.17.5.tar.xz";
219220 };
220221 };
221222 oxygen = {
222− version = "5.16.5";
223+ version = "5.17.5";
223224 src = fetchurl {
224− url = "${mirror}/stable/plasma/5.16.5/oxygen-5.16.5.tar.xz";
225− sha256 = "0e85dcd874d2e69aaa2d4eefc379289c7dd572437f53e42f1d6d260d97c2f8a2";
226− name = "oxygen-5.16.5.tar.xz";
225+ url = "${mirror}/stable/plasma/5.17.5/oxygen-5.17.5.tar.xz";
226+ sha256 = "58954374a4b9067365ee5d50b32b1986b2e7dd31e73cbf79fda8d978949943be";
227+ name = "oxygen-5.17.5.tar.xz";
227228 };
228229 };
229230 plasma-browser-integration = {
230− version = "5.16.5";
231+ version = "5.17.5";
231232 src = fetchurl {
232− url = "${mirror}/stable/plasma/5.16.5/plasma-browser-integration-5.16.5.tar.xz";
233− sha256 = "99269c7e27fddb0c075bff28a5afba41298dc8d28297d69f35f6bc30f3af1d35";
234− name = "plasma-browser-integration-5.16.5.tar.xz";
233+ url = "${mirror}/stable/plasma/5.17.5/plasma-browser-integration-5.17.5.tar.xz";
234+ sha256 = "07bc4285991ab43830873a12b8c07f60e4faea1ec81121db783c425f18a4f87d";
235+ name = "plasma-browser-integration-5.17.5.tar.xz";
235236 };
236237 };
237238 plasma-desktop = {
238− version = "5.16.5";
239+ version = "5.17.5";
239240 src = fetchurl {
240− url = "${mirror}/stable/plasma/5.16.5/plasma-desktop-5.16.5.tar.xz";
241− sha256 = "49dc4c9eff5742eb52fc0d12c139c194eda837945389cd09f498a0c4c352a20f";
242− name = "plasma-desktop-5.16.5.tar.xz";
241+ url = "${mirror}/stable/plasma/5.17.5/plasma-desktop-5.17.5.tar.xz";
242+ sha256 = "7f741ab026989bdcc68701955fc290d5ead38bf4bc310f18a2f32c64b411ab04";
243+ name = "plasma-desktop-5.17.5.tar.xz";
243244 };
244245 };
245246 plasma-integration = {
246− version = "5.16.5";
247+ version = "5.17.5";
247248 src = fetchurl {
248− url = "${mirror}/stable/plasma/5.16.5/plasma-integration-5.16.5.tar.xz";
249− sha256 = "635f109e7b59bb440c6be0c7a4baae70d2f44e659ab0522e170693b664e6d709";
250− name = "plasma-integration-5.16.5.tar.xz";
249+ url = "${mirror}/stable/plasma/5.17.5/plasma-integration-5.17.5.tar.xz";
250+ sha256 = "169206bebd790d2fee49cec621c46f6f64a8e20ee3e56bf16ee7373f61cad959";
251+ name = "plasma-integration-5.17.5.tar.xz";
251252 };
252253 };
253254 plasma-nm = {
254− version = "5.16.5";
255+ version = "5.17.5";
255256 src = fetchurl {
256− url = "${mirror}/stable/plasma/5.16.5/plasma-nm-5.16.5.tar.xz";
257− sha256 = "b519429bd784ff2ede0bf10e1e943822ef08ea5cf85e901363fda36d32907460";
258− name = "plasma-nm-5.16.5.tar.xz";
257+ url = "${mirror}/stable/plasma/5.17.5/plasma-nm-5.17.5.tar.xz";
258+ sha256 = "2165e47a0654d17735abc97aec287b46b52a2eafccc3591b667ea2755b731255";
259+ name = "plasma-nm-5.17.5.tar.xz";
259260 };
260261 };
261262 plasma-pa = {
262− version = "5.16.5";
263+ version = "5.17.5";
263264 src = fetchurl {
264− url = "${mirror}/stable/plasma/5.16.5/plasma-pa-5.16.5.tar.xz";
265− sha256 = "e029563d50cc6266a4a3e22574c33fef4670e1aaab18630eb30769e2167acc96";
266− name = "plasma-pa-5.16.5.tar.xz";
265+ url = "${mirror}/stable/plasma/5.17.5/plasma-pa-5.17.5.tar.xz";
266+ sha256 = "933c6ab1fda52b336a157a48b1ea64b81fd1d84ca08a40a52bfae276cca2bf23";
267+ name = "plasma-pa-5.17.5.tar.xz";
267268 };
268269 };
269270 plasma-sdk = {
270− version = "5.16.5";
271+ version = "5.17.5";
271272 src = fetchurl {
272− url = "${mirror}/stable/plasma/5.16.5/plasma-sdk-5.16.5.tar.xz";
273− sha256 = "1b05f0501309099f241ebae857c24b31bc4e61fde8bfc33e854d3a1dd3d37385";
274− name = "plasma-sdk-5.16.5.tar.xz";
273+ url = "${mirror}/stable/plasma/5.17.5/plasma-sdk-5.17.5.tar.xz";
274+ sha256 = "ff736029b1ae5773991db06f5827d9dcbd8e7a4e9a430c9014c35ddee2c55314";
275+ name = "plasma-sdk-5.17.5.tar.xz";
275276 };
276277 };
277278 plasma-tests = {
278− version = "5.16.5";
279+ version = "5.17.5";
279280 src = fetchurl {
280− url = "${mirror}/stable/plasma/5.16.5/plasma-tests-5.16.5.tar.xz";
281− sha256 = "236a83c2caa99801b6db1debce53a6c7390087115899410a8139ad3b7268b7f7";
282− name = "plasma-tests-5.16.5.tar.xz";
281+ url = "${mirror}/stable/plasma/5.17.5/plasma-tests-5.17.5.tar.xz";
282+ sha256 = "1b566b7118a5c8d1b25078d331a6bc77f48781010fbd3425d85b137811218982";
283+ name = "plasma-tests-5.17.5.tar.xz";
284+ };
285+ };
286+ plasma-thunderbolt = {
287+ version = "5.17.5";
288+ src = fetchurl {
289+ url = "${mirror}/stable/plasma/5.17.5/plasma-thunderbolt-5.17.5.tar.xz";
290+ sha256 = "3743f9841d269d51f1b1419e24d5cd1b26a0ba5a90e76b531328a8cc43184382";
291+ name = "plasma-thunderbolt-5.17.5.tar.xz";
283292 };
284293 };
285294 plasma-vault = {
286− version = "5.16.5";
295+ version = "5.17.5";
287296 src = fetchurl {
288− url = "${mirror}/stable/plasma/5.16.5/plasma-vault-5.16.5.tar.xz";
289− sha256 = "2bb40a80c35f3eaedc729013a8b6b76641cc74eca4fd171f1cda99237f83198c";
290− name = "plasma-vault-5.16.5.tar.xz";
297+ url = "${mirror}/stable/plasma/5.17.5/plasma-vault-5.17.5.tar.xz";
298+ sha256 = "3e5c6b4dd6c1122b6a221205da506881959ab905e467b74b0536e7f5fe130d71";
299+ name = "plasma-vault-5.17.5.tar.xz";
291300 };
292301 };
293302 plasma-workspace = {
294− version = "5.16.5";
303+ version = "5.17.5";
295304 src = fetchurl {
296− url = "${mirror}/stable/plasma/5.16.5/plasma-workspace-5.16.5.tar.xz";
297− sha256 = "43364fe4e7ea10ad7b5b1d7af4f1baa1d8796b60692f2dfc0d58693f63e458ff";
298− name = "plasma-workspace-5.16.5.tar.xz";
305+ url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-5.17.5.tar.xz";
306+ sha256 = "764488e66d52bc3017efb2c1471f57196aa50fbfa3a80637bf48f24955cfba88";
307+ name = "plasma-workspace-5.17.5.tar.xz";
299308 };
300309 };
301310 plasma-workspace-wallpapers = {
302− version = "5.16.5";
311+ version = "5.17.5";
303312 src = fetchurl {
304− url = "${mirror}/stable/plasma/5.16.5/plasma-workspace-wallpapers-5.16.5.tar.xz";
305− sha256 = "ff6e0eac42c540c72556439e6477fb78be2dab456386218813cce021f82d42d9";
306− name = "plasma-workspace-wallpapers-5.16.5.tar.xz";
313+ url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-wallpapers-5.17.5.tar.xz";
314+ sha256 = "8a28ef67b65c340d40ff8f5bfc333ead68e6d8c9e410769c43af847ced9b4ca9";
315+ name = "plasma-workspace-wallpapers-5.17.5.tar.xz";
307316 };
308317 };
309318 plymouth-kcm = {
310− version = "5.16.5";
319+ version = "5.17.5";
311320 src = fetchurl {
312− url = "${mirror}/stable/plasma/5.16.5/plymouth-kcm-5.16.5.tar.xz";
313− sha256 = "db839c5fe9f6df882b95f436983c129cd553dd50e6cf1065c4410a91b20f1dcc";
314− name = "plymouth-kcm-5.16.5.tar.xz";
321+ url = "${mirror}/stable/plasma/5.17.5/plymouth-kcm-5.17.5.tar.xz";
322+ sha256 = "bbd6994f60ed9d63b4e4dd0abe78bf1f9c14b8ecce8ba4355d16cd52a0a86528";
323+ name = "plymouth-kcm-5.17.5.tar.xz";
315324 };
316325 };
317326 polkit-kde-agent = {
318− version = "1-5.16.5";
327+ version = "1-5.17.5";
319328 src = fetchurl {
320− url = "${mirror}/stable/plasma/5.16.5/polkit-kde-agent-1-5.16.5.tar.xz";
321− sha256 = "6f7a17990d72bb25c93acae919b764f95ac226754209b2e177075fbe9251f95f";
322− name = "polkit-kde-agent-1-5.16.5.tar.xz";
329+ url = "${mirror}/stable/plasma/5.17.5/polkit-kde-agent-1-5.17.5.tar.xz";
330+ sha256 = "a79d76a2f584f6567639228fde6f75b3960484f7a65cfc69b6acb6df1de53f5d";
331+ name = "polkit-kde-agent-1-5.17.5.tar.xz";
323332 };
324333 };
325334 powerdevil = {
326− version = "5.16.5";
335+ version = "5.17.5";
327336 src = fetchurl {
328− url = "${mirror}/stable/plasma/5.16.5/powerdevil-5.16.5.tar.xz";
329− sha256 = "ac868f31df8c6bcc6b1c850efa0640695ba698caabefcb21fc0b0c3405712139";
330− name = "powerdevil-5.16.5.tar.xz";
337+ url = "${mirror}/stable/plasma/5.17.5/powerdevil-5.17.5.tar.xz";
338+ sha256 = "27904361e85e1267d933d8f0a0d3be4dc712099ed2eb3cf90959209a4443dd82";
339+ name = "powerdevil-5.17.5.tar.xz";
331340 };
332341 };
333342 sddm-kcm = {
334− version = "5.16.5";
343+ version = "5.17.5";
335344 src = fetchurl {
336− url = "${mirror}/stable/plasma/5.16.5/sddm-kcm-5.16.5.tar.xz";
337− sha256 = "4220d18f1a04c767649bffee1aed6c2b2c12c60cd7d6ca6fabc3dbec1ec3f127";
338− name = "sddm-kcm-5.16.5.tar.xz";
345+ url = "${mirror}/stable/plasma/5.17.5/sddm-kcm-5.17.5.tar.xz";
346+ sha256 = "e85fb9e014439e8c0e73638112139561aff9a9f71f26c3eafedff5a98a07b33b";
347+ name = "sddm-kcm-5.17.5.tar.xz";
339348 };
340349 };
341350 systemsettings = {
342− version = "5.16.5";
351+ version = "5.17.5";
343352 src = fetchurl {
344− url = "${mirror}/stable/plasma/5.16.5/systemsettings-5.16.5.tar.xz";
345− sha256 = "57944cf3f566cf5e25d5859f5716b2ad5dbd87de259f8d77efdfdd50a16fe1ec";
346− name = "systemsettings-5.16.5.tar.xz";
353+ url = "${mirror}/stable/plasma/5.17.5/systemsettings-5.17.5.tar.xz";
354+ sha256 = "50fa4d7866639995a6859446fc6a02a73ae05203e8f2ed31221e232ed3491eaf";
355+ name = "systemsettings-5.17.5.tar.xz";
347356 };
348357 };
349358 user-manager = {
350− version = "5.16.5";
359+ version = "5.17.5";
351360 src = fetchurl {
352− url = "${mirror}/stable/plasma/5.16.5/user-manager-5.16.5.tar.xz";
353− sha256 = "e9df3ec2718de68b0b46d0b86f993fe450b236e13dda6219f350121f08f4c468";
354− name = "user-manager-5.16.5.tar.xz";
361+ url = "${mirror}/stable/plasma/5.17.5/user-manager-5.17.5.tar.xz";
362+ sha256 = "10ed3196063c7dfed3b3f25dd199a48ca39fa86db5d0126ec84a543b1c212f0d";
363+ name = "user-manager-5.17.5.tar.xz";
355364 };
356365 };
357366 xdg-desktop-portal-kde = {
358− version = "5.16.5";
367+ version = "5.17.5";
359368 src = fetchurl {
360− url = "${mirror}/stable/plasma/5.16.5/xdg-desktop-portal-kde-5.16.5.tar.xz";
361− sha256 = "4884652b642fb6e8db791a04e9d42b5fec53f28cc0f0d26f49eb2bdaaa1709df";
362− name = "xdg-desktop-portal-kde-5.16.5.tar.xz";
369+ url = "${mirror}/stable/plasma/5.17.5/xdg-desktop-portal-kde-5.17.5.tar.xz";
370+ sha256 = "a993bd4b86a44c8237a3f4957c2594aa2ca8916204ad866f8af32f7df34740f6";
371+ name = "xdg-desktop-portal-kde-5.17.5.tar.xz";
363372 };
364373 };
365374}