From 1af6bdd48f21e120cb4539617d468eefb07c4f90 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 27 Jan 2020 08:29:28 -0600 Subject: [PATCH 01/12] plasma5: 5.16.5 -> 5.17.5 --- maintainers/scripts/fetch-kde-qt.sh | 3 +- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 371 ++++++++++++++-------------- 3 files changed, 193 insertions(+), 183 deletions(-) diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index a267a5fa8715..c6c980dd0cb6 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -28,7 +28,8 @@ find . -type f | while read src; do done cat >"$SRCS" < Date: Mon, 27 Jan 2020 08:29:51 -0600 Subject: [PATCH 02/12] kwin: Update patches for 5.17.5 --- .../plasma-5/kwin/0001-follow-symlinks.patch | 25 +++++++++++++++++++ .../{xwayland.patch => 0002-xwayland.patch} | 22 ++++++++++++---- pkgs/desktops/plasma-5/kwin/default.nix | 8 +++++- .../plasma-5/kwin/follow-symlinks.patch | 13 ---------- .../plasma-5/kwin/no-setcap-install.patch | 24 ------------------ pkgs/desktops/plasma-5/kwin/series | 3 --- 6 files changed, 49 insertions(+), 46 deletions(-) create mode 100644 pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch rename pkgs/desktops/plasma-5/kwin/{xwayland.patch => 0002-xwayland.patch} (50%) delete mode 100644 pkgs/desktops/plasma-5/kwin/follow-symlinks.patch delete mode 100644 pkgs/desktops/plasma-5/kwin/no-setcap-install.patch delete mode 100644 pkgs/desktops/plasma-5/kwin/series diff --git a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch new file mode 100644 index 000000000000..4861df46ca63 --- /dev/null +++ b/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch @@ -0,0 +1,25 @@ +From 449896c45b23f50c168d8d2789832024c906ec36 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 27 Jan 2020 05:31:13 -0600 +Subject: [PATCH 1/2] follow symlinks + +--- + plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/kdecorations/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp +index fd723a8..fb95633 100644 +--- a/plugins/kdecorations/aurorae/src/aurorae.cpp ++++ b/plugins/kdecorations/aurorae/src/aurorae.cpp +@@ -211,7 +211,7 @@ void Helper::init() + // so let's try to locate our plugin: + QString pluginPath; + for (const QString &path : m_engine->importPathList()) { +- QDirIterator it(path, QDirIterator::Subdirectories); ++ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + it.next(); + QFileInfo fileInfo = it.fileInfo(); +-- +2.23.1 + diff --git a/pkgs/desktops/plasma-5/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch similarity index 50% rename from pkgs/desktops/plasma-5/kwin/xwayland.patch rename to pkgs/desktops/plasma-5/kwin/0002-xwayland.patch index 9d405b3bbb86..0505810abe60 100644 --- a/pkgs/desktops/plasma-5/kwin/xwayland.patch +++ b/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch @@ -1,8 +1,17 @@ -Index: kwin-5.15.5/xwl/xwayland.cpp -=================================================================== ---- kwin-5.15.5.orig/xwl/xwayland.cpp -+++ kwin-5.15.5/xwl/xwayland.cpp -@@ -143,7 +143,7 @@ void Xwayland::init() +From d584b075d71c4486710c0bbed6d44038f2ff5075 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 27 Jan 2020 05:31:23 -0600 +Subject: [PATCH 2/2] xwayland + +--- + xwl/xwayland.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xwl/xwayland.cpp b/xwl/xwayland.cpp +index 5f17d39..b4b69ba 100644 +--- a/xwl/xwayland.cpp ++++ b/xwl/xwayland.cpp +@@ -145,7 +145,7 @@ void Xwayland::init() m_xwaylandProcess = new Process(this); m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel); @@ -11,3 +20,6 @@ Index: kwin-5.15.5/xwl/xwayland.cpp QProcessEnvironment env = m_app->processStartupEnvironment(); env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd)); env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM")); +-- +2.23.1 + diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index b8f381e97149..0e1709d8245c 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -14,6 +14,9 @@ plasma-framework, qtsensors, libcap, libdrm }: +# TODO (ttuegel): investigate qmlplugindump failure +# TODO (ttuegel): investigate gbm dependency + mkDerivation { name = "kwin"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; @@ -30,7 +33,10 @@ mkDerivation { libcap libdrm ]; outputs = [ "bin" "dev" "out" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./0001-follow-symlinks.patch + ./0002-xwayland.patch + ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' ]; diff --git a/pkgs/desktops/plasma-5/kwin/follow-symlinks.patch b/pkgs/desktops/plasma-5/kwin/follow-symlinks.patch deleted file mode 100644 index 60b8f5ef541f..000000000000 --- a/pkgs/desktops/plasma-5/kwin/follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kwin-5.7.3/plugins/kdecorations/aurorae/src/aurorae.cpp -=================================================================== ---- kwin-5.7.3.orig/plugins/kdecorations/aurorae/src/aurorae.cpp -+++ kwin-5.7.3/plugins/kdecorations/aurorae/src/aurorae.cpp -@@ -211,7 +211,7 @@ void Helper::init() - // so let's try to locate our plugin: - QString pluginPath; - for (const QString &path : m_engine->importPathList()) { -- QDirIterator it(path, QDirIterator::Subdirectories); -+ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - QFileInfo fileInfo = it.fileInfo(); diff --git a/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch b/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch deleted file mode 100644 index 80aacacc6ca0..000000000000 --- a/pkgs/desktops/plasma-5/kwin/no-setcap-install.patch +++ /dev/null @@ -1,24 +0,0 @@ -Dont set capabilities on kwin_wayland executable at build time - -This is handled by security.wrappers on NixOS - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 48cbcdbfe..93b410ed8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -674,15 +674,6 @@ if (HAVE_LIBCAP) - endif() - - install(TARGETS kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS} ) --if (HAVE_LIBCAP) -- install( -- CODE "execute_process( -- COMMAND -- ${SETCAP_EXECUTABLE} -- CAP_SYS_NICE=+ep -- \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/kwin_wayland)" -- ) --endif() - - add_subdirectory(platformsupport) - add_subdirectory(plugins) diff --git a/pkgs/desktops/plasma-5/kwin/series b/pkgs/desktops/plasma-5/kwin/series deleted file mode 100644 index 8efb74eabd67..000000000000 --- a/pkgs/desktops/plasma-5/kwin/series +++ /dev/null @@ -1,3 +0,0 @@ -follow-symlinks.patch -xwayland.patch -no-setcap-install.patch From 84ddb3da35d053e23ab05bc59f687779a1519734 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Jan 2020 07:20:48 -0600 Subject: [PATCH 03/12] plasma-workspace: Update patches for 5.17.5 --- .../plasma-workspace/0001-startkde.patch | 129 +++ .../plasma-5/plasma-workspace/default.nix | 68 +- .../plasma-workspace/plasma-workspace.patch | 1008 ----------------- 3 files changed, 151 insertions(+), 1054 deletions(-) create mode 100644 pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch delete mode 100644 pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch new file mode 100644 index 000000000000..a4eadfd77501 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch @@ -0,0 +1,129 @@ +From 1796822e4c97062b919a596ce13db68e2c46c7e8 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 28 Jan 2020 05:00:53 -0600 +Subject: [PATCH] startkde + +--- + startkde/startplasma-waylandsession.cpp | 2 +- + startkde/startplasma-x11.cpp | 2 +- + startkde/startplasma.cpp | 32 ++++++++----------------- + 3 files changed, 12 insertions(+), 24 deletions(-) + +diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp +index 87c71c6..5fc5314 100644 +--- a/startkde/startplasma-waylandsession.cpp ++++ b/startkde/startplasma-waylandsession.cpp +@@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/) + waitForKonqi(); + out << "startplasma-waylandsession: Shutting down...\n"; + +- runSync(QStringLiteral("kdeinit5_shutdown"), {}); ++ runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {}); + + cleanupX11(); + out << "startplasma-waylandsession: Done.\n"; +diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp +index 3314b62..14cbe29 100644 +--- a/startkde/startplasma-x11.cpp ++++ b/startkde/startplasma-x11.cpp +@@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/) + + out << "startkde: Shutting down...\n"; + +- runSync(QStringLiteral("kdeinit5_shutdown"), {}); ++ runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {}); + + cleanupPlasmaEnvironment(); + cleanupX11(); +diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp +index e0f7004..8ac41fd 100644 +--- a/startkde/startplasma.cpp ++++ b/startkde/startplasma.cpp +@@ -34,7 +34,7 @@ QTextStream out(stderr); + void messageBox(const QString &text) + { + out << text; +- runSync(QStringLiteral("xmessage"), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text}); ++ runSync(QStringLiteral(NIXPKGS_XMESSAGE), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text}); + } + + QStringList allServices(const QLatin1String& prefix) +@@ -184,14 +184,6 @@ void runEnvironmentScripts() + } + } + sourceFiles(scripts); +- +- // Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. +- // The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend +- // to set it to a list of paths *not* including the KDE prefix if it's not /usr or +- // /usr/local. +- if (!qEnvironmentVariableIsSet("XDG_DATA_DIRS")) { +- qputenv("XDG_DATA_DIRS", KDE_INSTALL_FULL_DATAROOTDIR ":/usr/share:/usr/local/share"); +- } + } + + +@@ -240,15 +232,15 @@ void setupX11() + // If the user has overwritten fonts, the cursor font may be different now + // so don't move this up. + +- runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); +- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")}); +- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")}); ++ runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); ++ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")}); ++ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")}); + } + + void cleanupX11() + { +- runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") }); +- runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") }); ++ runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") }); ++ runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") }); + } + + // TODO: Check if Necessary +@@ -265,11 +257,7 @@ bool syncDBusEnvironment() + { + int exitCode; + // At this point all environment variables are set, let's send it to the DBus session server to update the activation environment +- if (!QStandardPaths::findExecutable(QStringLiteral("dbus-update-activation-environment")).isEmpty()) { +- exitCode = runSync(QStringLiteral("dbus-update-activation-environment"), { QStringLiteral("--systemd"), QStringLiteral("--all") }); +- } else { +- exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR "/ksyncdbusenv"), {}); +- } ++ exitCode = runSync(QStringLiteral(NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT), { QStringLiteral("--systemd"), QStringLiteral("--all") }); + return exitCode == 0; + } + +@@ -285,7 +273,7 @@ void setupFontDpi() + //TODO port to c++? + const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); + QProcess p; +- p.start(QStringLiteral("xrdb"), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") }); ++ p.start(QStringLiteral(NIXPKGS_XRDB), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") }); + p.setProcessChannelMode(QProcess::ForwardedChannels); + p.write(input); + p.closeWriteChannel(); +@@ -307,7 +295,7 @@ QProcess* setupKSplash() + KConfigGroup ksplashCfg = cfg.group("KSplash"); + if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { + p = new QProcess; +- p->start(QStringLiteral("ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) }); ++ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) }); + } + } + return p; +@@ -329,7 +317,7 @@ bool startKDEInit() + { + // We set LD_BIND_NOW to increase the efficiency of kdeinit. + // kdeinit unsets this variable before loading applications. +- const int exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), { QStringLiteral("--kded"), QStringLiteral("+kcminit_startup") }, { QStringLiteral("LD_BIND_NOW=true") }); ++ const int exitCode = runSync(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), { QStringLiteral("--kded"), QStringLiteral("+kcminit_startup") }, { QStringLiteral("LD_BIND_NOW=true") }); + if (exitCode != 0) { + messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation.")); + return false; +-- +2.23.1 + diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 1403c9e4c8b7..7d6cc10cd4db 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -6,12 +6,12 @@ coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, libXtst, pam, wayland, xmessage, xprop, xrdb, xsetroot, - baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, - kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, kjsembed, knewstuff, - knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets, - kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate, - networkmanager-qt, phonon, plasma-framework, prison, solid, kholidays, - breeze-qt5, + baloo, kactivities, kactivities-stats, kcmutils, kconfig, kcrash, kdbusaddons, + kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, + kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner, kscreenlocker, + ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, + libksysguard, libqalculate, networkmanager-qt, phonon, plasma-framework, + prison, solid, kholidays, breeze-qt5, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtwayland, qtx11extras, @@ -26,53 +26,29 @@ mkDerivation { buildInputs = [ isocodes libdbusmenu libSM libXcursor libXtst pam wayland - baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative - kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff - knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets - kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate - networkmanager-qt phonon plasma-framework prison solid kholidays + baloo kactivities kactivities-stats kcmutils kconfig kcrash kdbusaddons + kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff + knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor + ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard + libqalculate networkmanager-qt phonon plasma-framework prison solid + kholidays qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras ]; propagatedUserEnvPkgs = [ qtgraphicaleffects ]; outputs = [ "out" "dev" ]; - cmakeFlags = [ - "-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage" - "-DNIXPKGS_MKDIR=${getBin coreutils}/bin/mkdir" - "-DNIXPKGS_XRDB=${getBin xrdb}/bin/xrdb" - "-DNIXPKGS_QTPATHS=${getBin qttools}/bin/qtpaths" - "-DNIXPKGS_XSETROOT=${getBin xsetroot}/bin/xsetroot" - "-DNIXPKGS_XPROP=${getBin xprop}/bin/xprop" - "-DNIXPKGS_ID=${getBin coreutils}/bin/id" - "-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT=${getBin dbus}/bin/dbus-update-activation-environment" - "-DNIXPKGS_START_KDEINIT_WRAPPER=${getLib kinit}/libexec/kf5/start_kdeinit_wrapper" - "-DNIXPKGS_QDBUS=${getBin qttools}/bin/qdbus" - "-DNIXPKGS_KWRAPPER5=${getBin kinit}/bin/kwrapper5" - "-DNIXPKGS_KREADCONFIG5=${getBin kconfig}/bin/kreadconfig5" - "-DNIXPKGS_GREP=${getBin gnugrep}/bin/grep" - "-DNIXPKGS_KDEINIT5_SHUTDOWN=${getBin kinit}/bin/kdeinit5_shutdown" - "-DNIXPKGS_SED=${getBin gnused}/bin/sed" - "-DNIXPKGS_WALLPAPER_INSTALL_DIR=${getBin breeze-qt5}/share/wallpapers/" - ]; - - # To regenerate ./plasma-workspace.patch, - # - # > git clone https://github.com/ttuegel/plasma-workspace - # > cd plasma-workspace - # > git checkout nixpkgs/$x.$y # where $x.$y.$z == $version - # ... make some commits ... - # > git diff v$x.$y.$z - # - # Add upstream patches to the list below. For new patchs, particularly if not - # submitted upstream, please make a pull request and add it to - # ./plasma-workspace.patch. patches = [ - ./plasma-workspace.patch + ./0001-startkde.patch ]; - preConfigure = '' - NIX_CFLAGS_COMPILE+=" -DNIXPKGS_KDOSTARTUPCONFIG5=\"''${!outputBin}/bin/kdostartupconfig5\"" - cmakeFlags+=" -DNIXPKGS_STARTPLASMA=''${!outputBin}/libexec/startplasma" - ''; + NIX_CFLAGS_COMPILE = [ + ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' + ''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"'' + ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"'' + ''-DNIXPKGS_XPROP="${getBin xprop}/bin/xprop"'' + ''-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT="${getBin dbus}/bin/dbus-update-activation-environment"'' + ''-DNIXPKGS_START_KDEINIT_WRAPPER="${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"'' + ''-DNIXPKGS_KDEINIT5_SHUTDOWN="${getBin kinit}/bin/kdeinit5_shutdown"'' + ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch deleted file mode 100644 index 5159328ed3fe..000000000000 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ /dev/null @@ -1,1008 +0,0 @@ -diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake -index ea9a943..f98ddd2 100644 ---- a/sddm-theme/theme.conf.cmake -+++ b/sddm-theme/theme.conf.cmake -@@ -2,4 +2,4 @@ - type=image - color=#1d99f3 - fontSize=10 --background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png -+background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png -diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt -index 6a1a212..f03fd34 100644 ---- a/startkde/CMakeLists.txt -+++ b/startkde/CMakeLists.txt -@@ -4,11 +4,6 @@ add_subdirectory(ksyncdbusenv) - add_subdirectory(waitforname) - add_subdirectory(kcheckrunning) - --#FIXME: reconsider, looks fishy --if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") -- 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") --endif() -- - configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY) - configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor @ONLY) - configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma @ONLY) -diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp -index 493218e..d507aa5 100644 ---- a/startkde/kstartupconfig/kstartupconfig.cpp -+++ b/startkde/kstartupconfig/kstartupconfig.cpp -@@ -147,5 +147,5 @@ int main() - fclose( keys ); - fclose( config ); - doit: -- return system( "kdostartupconfig5" ); -+ return system( NIXPKGS_KDOSTARTUPCONFIG5 ); - } -diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index b68f0c6..97a13a1 100644 ---- a/startkde/startkde.cmake -+++ b/startkde/startkde.cmake -@@ -1,22 +1,31 @@ - #!/bin/sh - # --# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) -+# NIXPKGS KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) - # - -+if test "x$1" = x--failsafe; then -+ KDE_FAILSAFE=1 # General failsafe flag -+ KWIN_COMPOSE=N # Disable KWin's compositing -+ QT_XCB_FORCE_SOFTWARE_OPENGL=1 -+ export KWIN_COMPOSE KDE_FAILSAFE QT_XCB_FORCE_SOFTWARE_OPENGL -+fi -+ - # When the X server dies we get a HUP signal from xinit. We must ignore it - # because we still need to do some cleanup. - trap 'echo GOT SIGHUP' HUP - --# Check if a Plasma session already is running and whether it's possible to connect to X --kcheckrunning -+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading -+unset DYLD_FORCE_FLAT_NAMESPACE -+ -+# Check if a KDE session already is running and whether it's possible to connect to X -+@CMAKE_INSTALL_FULL_BINDIR@/kcheckrunning - kcheckrunning_result=$? --if test $kcheckrunning_result -eq 0 ; then -- echo "Plasma seems to be already running on this display." -- xmessage -geometry 500x100 "Plasma seems to be already running on this display." > /dev/null 2>/dev/null -- exit 1 --elif test $kcheckrunning_result -eq 2 ; then -- echo "\$DISPLAY is not set or cannot connect to the X server." -- exit 1 -+if [ $kcheckrunning_result -eq 0 ]; then -+ echo "KDE seems to be already running on this display." -+ exit 1 -+elif [ $kcheckrunning_result -eq 2 ]; then -+ echo "\$DISPLAY is not set or cannot connect to the X server." -+ exit 1 - fi - - # Boot sequence: -@@ -33,62 +42,143 @@ fi - # - # * Then ksmserver is started which takes control of the rest of the startup sequence - --if [ ${XDG_CONFIG_HOME} ]; then -- configDir=$XDG_CONFIG_HOME; --else -- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html -+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" -+@NIXPKGS_MKDIR@ -p "$XDG_CONFIG_HOME" -+ -+# The KDE icon cache is supposed to update itself -+# automatically, but it uses the timestamp on the icon -+# theme directory as a trigger. Since in Nix the -+# timestamp is always the same, this doesn't work. So as -+# a workaround, nuke the icon cache on login. This isn't -+# perfect, since it may require logging out after -+# installing new applications to update the cache. -+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html -+rm -fv $HOME/.cache/icon-cache.kcache -+ -+# xdg-desktop-settings generates this empty file but -+# it makes kbuildsyscoca5 fail silently. To fix this -+# remove that menu if it exists. -+rm -fv $HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu -+ -+# Remove the kbuildsyscoca5 cache. It will be regenerated immediately after. -+# This is necessary for kbuildsyscoca5 to recognize that software that has been removed. -+rm -fv $HOME/.cache/ksycoca* -+ -+# Qt writes a weird ‘libraryPath’ line to -+# ~/.config/Trolltech.conf that causes the KDE plugin -+# paths of previous KDE invocations to be searched. -+# Obviously using mismatching KDE libraries is potentially -+# disastrous, so here we nuke references to the Nix store -+# in Trolltech.conf. A better solution would be to stop -+# Qt from doing this wackiness in the first place. -+if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then -+ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf - fi - sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg} - --# We need to create config folder so we can write startupconfigkeys --mkdir -p $configDir -+@NIXPKGS_KBUILDSYCOCA5@ -+ -+# Set the default GTK 2 theme -+gtkrc2="$HOME/.gtkrc-2.0" -+breeze_gtkrc2="/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" -+if ! [ -e "$gtkrc2" ] && [ -e "$breeze_gtkrc2" ]; then -+ cat >"$gtkrc2" <"$gtk3_settings" <"$kcminputrc" <$configDir/startupconfigkeys <"$XDG_CONFIG_HOME/startupconfigkeys" <$plasmalocalerc <"$plasmalocalerc" <$kdeglobalsfile <"$kdeglobalsfile" <&2 - exit 1 - fi --[ -r $configDir/startupconfig ] && . $configDir/startupconfig -- -+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then -+ . "$XDG_CONFIG_HOME/startupconfig" -+fi - - #Do not sync any of this section with the wayland versions as there scale factors are - #sent properly over wl_output -@@ -104,26 +194,33 @@ fi - #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us - export QT_AUTO_SCREEN_SCALE_FACTOR=0 - -+#Set the QtQuickControls style to our own: for QtQuickControls1 -+#it will fall back to Desktop, while it will use our own org.kde.desktop -+#for QtQuickControlsStyle and Kirigami -+export QT_QUICK_CONTROLS_STYLE=org.kde.desktop -+ -+XCURSOR_PATH=~/.icons -+IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS" -+for xdgDir in "${xdgDirs[@]}"; do -+ XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons" -+done -+export XCURSOR_PATH -+ - # XCursor mouse theme needs to be applied here to work even for kded or ksmserver - if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then -- @EXPORT_XCURSOR_PATH@ -- - kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" -- if test $? -eq 10; then -- XCURSOR_THEME=breeze_cursors -- export XCURSOR_THEME -- elif test -n "$kcminputrc_mouse_cursortheme"; then -- XCURSOR_THEME="$kcminputrc_mouse_cursortheme" -- export XCURSOR_THEME -+ if [ $? -eq 10 ]; then -+ export XCURSOR_THEME=breeze_cursors -+ elif [ -n "$kcminputrc_mouse_cursortheme" ]; then -+ export XCURSOR_THEME="$kcminputrc_mouse_cursortheme" - fi -- if test -n "$kcminputrc_mouse_cursorsize"; then -- XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" -- export XCURSOR_SIZE -+ if [ -n "$kcminputrc_mouse_cursorsize" ]; then -+ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" - fi - fi - --if test "$kcmfonts_general_forcefontdpi" -ne 0; then -- xrdb -quiet -merge -nocpp </plasma-workspace/env/*.sh --# (where correspond to the system and user's configuration --# directory. --# --# This is where you can define environment variables that will be available to --# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` --# or eval `gpg-agent --daemon`. --# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script --# --# (see end of this file). --# For anything else (that doesn't set env vars, or that needs a window manager), --# better use the Autostart folder. -- --scriptpath=`echo "$configDir:$sysConfigDirs" | tr ':' '\n'` -- --for prefix in `echo $scriptpath`; do -- for file in "$prefix"/plasma-workspace/env/*.sh; do -- test -r "$file" && . "$file" || true -- done --done -- - # Set a left cursor instead of the standard X11 "X" cursor, since I've heard - # from some users that they're confused and don't know what to do. This is - # especially necessary on slow machines, where starting KDE takes one or two -@@ -221,44 +297,65 @@ export XDG_DATA_DIRS - # - KDE_FULL_SESSION=true - export KDE_FULL_SESSION --xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true -+@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - - KDE_SESSION_VERSION=5 - export KDE_SESSION_VERSION --xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 -+@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - --KDE_SESSION_UID=`id -ru` -+KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru) - export KDE_SESSION_UID - - XDG_CURRENT_DESKTOP=KDE - export XDG_CURRENT_DESKTOP - -+# Enforce xcb QPA. Helps switching between Wayland and X sessions. -+export QT_QPA_PLATFORM=xcb -+ -+# Source scripts found in /plasma-workspace/env/*.sh -+# (where correspond to the system and user's configuration -+# directories, as identified by Qt's qtpaths, e.g. $HOME/.config -+# and /etc/xdg/ on Linux) -+# -+# This is where you can define environment variables that will be available to -+# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` -+# or eval `gpg-agent --daemon`. -+# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script -+# -+# (see end of this file). -+# For anything else (that doesn't set env vars, or that needs a window manager), -+# better use the Autostart folder. -+ -+IFS=":" read -r -a scriptpath <<< $(@NIXPKGS_QTPATHS@ --paths GenericConfigLocation) -+# Add /env/ to the directory to locate the scripts to be sourced -+for prefix in "${scriptpath[@]}"; do -+ for file in "$prefix"/plasma-workspace/env/*.sh; do -+ if [ -r "$file" ]; then -+ . "$file" -+ fi -+ done -+done -+ - # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment --if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then -- dbus-update-activation-environment --systemd --all --else -- @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv --fi --if test $? -ne 0; then -+ -+if ! @NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT@ --systemd --all; then - # Startup error - echo 'startkde: Could not sync environment to dbus.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not sync environment to dbus." - exit 1 - fi - - # We set LD_BIND_NOW to increase the efficiency of kdeinit. - # kdeinit unsets this variable before loading applications. --LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup -+LD_BIND_NOW=true @NIXPKGS_START_KDEINIT_WRAPPER@ --kded +kcminit_startup - if test $? -ne 0; then - # Startup error - echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." - exit 1 - fi - --qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & -+@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & - - # finally, give the session control to the session manager - # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -270,12 +367,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & - # We only check for 255 which means that the ksmserver process could not be - # started, any problems thereafter, e.g. ksmserver failing to initialize, - # will remain undetected. --test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" -+if [ -n "$KDEWM" ]; then -+ KDEWM="--windowmanager $KDEWM" -+fi - # If the session should be locked from the start (locked autologin), - # lock now and do the rest of the KDE startup underneath the locker. - KSMSERVEROPTIONS="" --test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" --kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS -+if [ -n "$dl" ]; then -+ KSMSERVEROPTIONS=" --lockscreen" -+fi -+@NIXPKGS_KWRAPPER5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS - if test $? -eq 255; then - # Startup error - echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 -@@ -286,19 +387,19 @@ fi - #Anything after here is logout - #It is not called after shutdown/restart - --wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` -+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) - --if test x"$wait_drkonqi"x = x"true"x ; then -+if [ x"$wait_drkonqi"x = x"true"x ]; then - # wait for remaining drkonqi instances with timeout (in seconds) -- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` -+ wait_drkonqi_timeout=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900) - wait_drkonqi_counter=0 -- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do -+ while @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ -q "^[^w]*org.kde.drkonqi" ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) -- if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then -+ if [ "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ]; then - # ask remaining drkonqis to die in a graceful way -- qdbus | grep 'org.kde.drkonqi-' | while read address ; do -- qdbus "$address" "/MainApplication" "quit" -+ @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do -+ @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit" - done - break - fi -@@ -307,15 +408,17 @@ fi - - echo 'startkde: Shutting down...' 1>&2 - # just in case --test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -+if [ -n "$ksplash_pid" ]; then -+ kill "$ksplash_pid" 2>/dev/null -+fi - - # Clean up --kdeinit5_shutdown -+@NIXPKGS_KDEINIT5_SHUTDOWN@ - - unset KDE_FULL_SESSION --xprop -root -remove KDE_FULL_SESSION -+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION - unset KDE_SESSION_VERSION --xprop -root -remove KDE_SESSION_VERSION -+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION - unset KDE_SESSION_UID - - echo 'startkde: Done.' 1>&2 -diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index 1fe41c5..11757df 100644 ---- a/startkde/startplasma.cmake -+++ b/startkde/startplasma.cmake -@@ -1,6 +1,6 @@ - #!/bin/sh - # --# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) -+# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) - # - - # Boot sequence: -@@ -17,28 +17,26 @@ - # - # * Then ksmserver is started which takes control of the rest of the startup sequence - --# We need to create config folder so we can write startupconfigkeys --if [ ${XDG_CONFIG_HOME} ]; then -- configDir=$XDG_CONFIG_HOME; --else -- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html -+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" -+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then -+ . "$XDG_CONFIG_HOME/startupconfig" - fi - --[ -r $configDir/startupconfig ] && . $configDir/startupconfig -- --xrdb -quiet -merge -nocpp <&2 - - # export our session variables to the Xwayland server --xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true --xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 -+@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true -+@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - - # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment - if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then -@@ -90,16 +78,15 @@ fi - - # We set LD_BIND_NOW to increase the efficiency of kdeinit. - # kdeinit unsets this variable before loading applications. --LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup -+LD_BIND_NOW=true @NIXPKGS_START_KDEINIT_WRAPPER@ --kded +kcminit_startup - if test $? -ne 0; then - # Startup error - echo 'startplasma: Could not start kdeinit5. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." - exit 1 - fi - --qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & -+@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & - - # finally, give the session control to the session manager - # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -125,19 +112,19 @@ fi - #Anything after here is logout - #It is not called after shutdown/restart - --wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` -+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) - --if test x"$wait_drkonqi"x = x"true"x ; then -+if [ x"$wait_drkonqi"x = x"true"x ]; then - # wait for remaining drkonqi instances with timeout (in seconds) -- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` -+ wait_drkonqi_timeout=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900) - wait_drkonqi_counter=0 -- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do -+ while @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ -q "^[^w]*org.kde.drkonqi" ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) -- if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then -+ if [ "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ]; then - # ask remaining drkonqis to die in a graceful way -- qdbus | grep 'org.kde.drkonqi-' | while read address ; do -- qdbus "$address" "/MainApplication" "quit" -+ @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do -+ @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit" - done - break - fi -@@ -146,15 +133,17 @@ fi - - echo 'startplasma: Shutting down...' 1>&2 - # just in case --test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -+if [ -n "$ksplash_pid" ]; then -+ "$ksplash_pid" 2>/dev/null -+fi - - # Clean up --kdeinit5_shutdown -+@NIXPKGS_KDEINIT5_SHUTDOWN@ - - unset KDE_FULL_SESSION --xprop -root -remove KDE_FULL_SESSION -+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION - unset KDE_SESSION_VERSION --xprop -root -remove KDE_SESSION_VERSION -+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION - unset KDE_SESSION_UID - - echo 'startplasma: Done.' 1>&2 -diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index dcb473a..0988740 100644 ---- a/startkde/startplasmacompositor.cmake -+++ b/startkde/startplasmacompositor.cmake -@@ -1,118 +1,174 @@ - #!/bin/sh - # --# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) -+# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) - # - --# We need to create config folder so we can write startupconfigkeys --if [ ${XDG_CONFIG_HOME} ]; then -- configDir=$XDG_CONFIG_HOME; --else -- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html -+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading -+unset DYLD_FORCE_FLAT_NAMESPACE -+ -+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" -+@NIXPKGS_MKDIR@ -p "$XDG_CONFIG_HOME" -+ -+# The KDE icon cache is supposed to update itself -+# automatically, but it uses the timestamp on the icon -+# theme directory as a trigger. Since in Nix the -+# timestamp is always the same, this doesn't work. So as -+# a workaround, nuke the icon cache on login. This isn't -+# perfect, since it may require logging out after -+# installing new applications to update the cache. -+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html -+rm -fv $HOME/.cache/icon-cache.kcache -+ -+# xdg-desktop-settings generates this empty file but -+# it makes kbuildsyscoca5 fail silently. To fix this -+# remove that menu if it exists. -+rm -fv $HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu -+ -+# Remove the kbuildsyscoca5 cache. It will be regenerated immediately after. -+# This is necessary for kbuildsyscoca5 to recognize that software that has been removed. -+rm -fv $HOME/.cache/ksycoca* -+ -+# Qt writes a weird ‘libraryPath’ line to -+# ~/.config/Trolltech.conf that causes the KDE plugin -+# paths of previous KDE invocations to be searched. -+# Obviously using mismatching KDE libraries is potentially -+# disastrous, so here we nuke references to the Nix store -+# in Trolltech.conf. A better solution would be to stop -+# Qt from doing this wackiness in the first place. -+if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then -+ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf -+fi -+ -+@NIXPKGS_KBUILDSYCOCA5@ -+ -+# Set the default GTK 2 theme -+gtkrc2="$HOME/.gtkrc-2.0" -+breeze_gtkrc2="/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" -+if ! [ -e "$gtkrc2" ] && [ -e "$breeze_gtkrc2" ]; then -+ cat >"$gtkrc2" <"$gtk3_settings" <"$kcminputrc" <$configDir/startupconfigkeys <"$XDG_CONFIG_HOME/startupconfigkeys" <$plasmalocalerc <"$plasmalocalerc" <$kdeglobalsfile <"$kdeglobalsfile" </dev/null 2>/dev/null; then -+if @NIXPKGS_QDBUS@ --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then - # Do not overwrite existing values. There is no point in setting only some - # of them as then they would not match anymore. - if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \ -@@ -141,41 +197,10 @@ if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then - fi - fi - --# Source scripts found in /plasma-workspace/env/*.sh --# (where correspond to the system and user's configuration --# directories, as identified by Qt's qtpaths, e.g. $HOME/.config --# and /etc/xdg/ on Linux) --# --# This is where you can define environment variables that will be available to --# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` --# or eval `gpg-agent --daemon`. --# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script --# --# (see end of this file). --# For anything else (that doesn't set env vars, or that needs a window manager), --# better use the Autostart folder. -- --scriptpath=`echo "$configDir:$sysConfigDirs" | tr ':' '\n'` -- --for prefix in `echo $scriptpath`; do -- for file in "$prefix"/plasma-workspace/env/*.sh; do -- test -r "$file" && . "$file" || true -- done --done -- - echo 'startplasmacompositor: Starting up...' 1>&2 - --# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. --# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend --# to set it to a list of paths *not* including the KDE prefix if it's not /usr or --# /usr/local. --if test -z "$XDG_DATA_DIRS"; then --XDG_DATA_DIRS="@KDE_INSTALL_FULL_DATADIR@:/usr/share:/usr/local/share" --fi --export XDG_DATA_DIRS -- - # Make sure that D-Bus is running --if qdbus >/dev/null 2>/dev/null; then -+if @NIXPKGS_QDBUS@ >/dev/null 2>/dev/null; then - : # ok - else - echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2 -@@ -212,7 +237,7 @@ export KDE_FULL_SESSION - KDE_SESSION_VERSION=5 - export KDE_SESSION_VERSION - --KDE_SESSION_UID=`id -ru` -+KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru) - export KDE_SESSION_UID - - XDG_CURRENT_DESKTOP=KDE -@@ -221,20 +246,41 @@ export XDG_CURRENT_DESKTOP - XDG_SESSION_TYPE=wayland - export XDG_SESSION_TYPE - -+# Source scripts found in /plasma-workspace/env/*.sh -+# (where correspond to the system and user's configuration -+# directories, as identified by Qt's qtpaths, e.g. $HOME/.config -+# and /etc/xdg/ on Linux) -+# -+# This is where you can define environment variables that will be available to -+# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` -+# or eval `gpg-agent --daemon`. -+# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script -+# -+# (see end of this file). -+# For anything else (that doesn't set env vars, or that needs a window manager), -+# better use the Autostart folder. -+ -+IFS=":" read -r -a scriptpath <<< $(@NIXPKGS_QTPATHS@ --paths GenericConfigLocation) -+# Add /env/ to the directory to locate the scripts to be sourced -+for prefix in "${scriptpath[@]}"; do -+ for file in "$prefix"/plasma-workspace/env/*.sh; do -+ if [ -r "$file" ]; then -+ . "$file" -+ fi -+ done -+done -+ - # kwin_wayland can possibly also start dbus-activated services which need env variables. - # In that case, the update in startplasma might be too late. --if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then -- dbus-update-activation-environment --systemd --all --else -- @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv --fi --if test $? -ne 0; then -- # Startup error -- echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2 -- exit 1 -+if ! @NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT@ --systemd --all; then -+ # Startup error -+ echo 'startkde: Could not sync environment to dbus.' 1>&2 -+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -+ echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2 -+ exit 1 - fi - --@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma -+@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@NIXPKGS_STARTPLASMA@ - - echo 'startplasmacompositor: Shutting down...' 1>&2 - From 48bcb6dc8fe8cbecb26eb5a5d3d39c1cc0719c5e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 31 Jan 2020 19:47:55 -0600 Subject: [PATCH 04/12] milou: kitemmodels buildInput --- pkgs/desktops/plasma-5/milou.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index db019db358bb..790979d664fc 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -1,15 +1,15 @@ { mkDerivation, extra-cmake-modules, - kcoreaddons, kdeclarative, ki18n, krunner, kservice, plasma-framework, - qtscript, qtdeclarative + kcoreaddons, kdeclarative, ki18n, kitemmodels, krunner, kservice, + plasma-framework, qtscript, qtdeclarative }: mkDerivation { name = "milou"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcoreaddons kdeclarative ki18n krunner kservice plasma-framework + kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework qtdeclarative qtscript ]; } From 7497244541511506f231fe7035417e445a5f3ee1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 31 Jan 2020 19:48:14 -0600 Subject: [PATCH 05/12] kscreen: kcmutils buildInput --- pkgs/desktops/plasma-5/kscreen.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 422bb95c6059..d46d48b9c5bf 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -1,17 +1,17 @@ { mkDerivation, extra-cmake-modules, - kconfig, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, - kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, kwindowsystem, - kdeclarative, plasma-framework + kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, + kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, + kwindowsystem, kdeclarative, plasma-framework }: mkDerivation { name = "kscreen"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui - libkscreen qtdeclarative qtgraphicaleffects kwindowsystem kdeclarative - plasma-framework + kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n + kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects + kwindowsystem kdeclarative plasma-framework ]; } From 9b85a399fd130b5ca0d40cbef026d1bc73d220ea Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 31 Jan 2020 19:55:25 -0600 Subject: [PATCH 07/12] nixos/plasma5: startkde -> startplasma-x11 --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 2538858ac0f7..ea9b428c0633 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -60,7 +60,7 @@ in -e '/^toolBarFont=/ s/,Regular$//' fi - exec "${getBin plasma5.plasma-workspace}/bin/startkde" + exec "${getBin plasma5.plasma-workspace}/bin/startplasma-x11" ''; }; From 91fcbe482566babef0665bc5cc04467ecfb57bac Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 1 Feb 2020 06:55:49 -0600 Subject: [PATCH 09/12] kwayland-integration: kguiaddons buildInput --- pkgs/desktops/plasma-5/kwayland-integration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 1344b477f736..667d3ead1768 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -1,11 +1,11 @@ { mkDerivation, extra-cmake-modules, - kidletime, kwayland, kwindowsystem, qtbase, + kguiaddons, kidletime, kwayland, kwindowsystem, qtbase, }: mkDerivation { name = "kwayland-integration"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kidletime kwindowsystem kwayland qtbase ]; + buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase ]; } From 7de452a5223799b2e9c9f870b76fe822249010a5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 1 Feb 2020 06:58:29 -0600 Subject: [PATCH 10/12] plasma-browser-integration: kpurpose kfilemetadata buildInputs --- .../plasma-5/plasma-browser-integration.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix index e01efabe8a6a..f6855cb34da1 100644 --- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-browser-integration.nix @@ -1,11 +1,18 @@ -{ mkDerivation, extra-cmake-modules, qtbase, kio, ki18n, kconfig -, kdbusaddons, knotifications, krunner, kwindowsystem, kactivities +{ + mkDerivation, + extra-cmake-modules, + qtbase, + kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose, + krunner, kwindowsystem, kactivities, }: mkDerivation { name = "plasma-browser-integration"; nativeBuildInputs = [ - extra-cmake-modules qtbase kio ki18n kconfig kdbusaddons - knotifications krunner kwindowsystem kactivities + extra-cmake-modules + ]; + buildInputs = [ + qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose + krunner kwindowsystem kactivities ]; } From 33dfefad146e46d84a10977c5855caf9a987a086 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 1 Feb 2020 06:59:13 -0600 Subject: [PATCH 11/12] nixos/plasma5: install plasma-browser-integration --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index ea9b428c0633..bd0a2f3481fa 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -137,6 +137,7 @@ in libkscreen libksysguard milou + plasma-browser-integration plasma-integration polkit-kde-agent systemsettings From 27fc6620e9f99991bbaae78e15c5a0626af39e12 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 5 Feb 2020 20:08:40 -0600 Subject: [PATCH 12/12] plasma5.plasma-workspace: Fix path to SDDM theme background image --- .../plasma-workspace/0001-startkde.patch | 2 +- .../0002-absolute-wallpaper-install-dir.patch | 22 +++++++++++++++++++ .../plasma-5/plasma-workspace/default.nix | 18 ++++++++++----- 3 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch index a4eadfd77501..d230e1270bea 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch @@ -1,7 +1,7 @@ From 1796822e4c97062b919a596ce13db68e2c46c7e8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Jan 2020 05:00:53 -0600 -Subject: [PATCH] startkde +Subject: [PATCH 1/2] startkde --- startkde/startplasma-waylandsession.cpp | 2 +- diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch new file mode 100644 index 000000000000..8fa9e1d31cff --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch @@ -0,0 +1,22 @@ +From 7c6f939aea290bc3ec7629f26d02441d1d4bcb8a Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 5 Feb 2020 05:03:11 -0600 +Subject: [PATCH 2/2] absolute-wallpaper-install-dir + +--- + sddm-theme/theme.conf.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake +index ea9a943..c8458ba 100644 +--- a/sddm-theme/theme.conf.cmake ++++ b/sddm-theme/theme.conf.cmake +@@ -2,4 +2,4 @@ + type=image + color=#1d99f3 + fontSize=10 +-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png ++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png +-- +2.23.1 + diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 7d6cc10cd4db..6aa0e3b57382 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -6,12 +6,12 @@ coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, libXtst, pam, wayland, xmessage, xprop, xrdb, xsetroot, - baloo, kactivities, kactivities-stats, kcmutils, kconfig, kcrash, kdbusaddons, - kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, - kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner, kscreenlocker, - ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, - libksysguard, libqalculate, networkmanager-qt, phonon, plasma-framework, - prison, solid, kholidays, breeze-qt5, + baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash, + kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, + kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner, + kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, + kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt, + phonon, plasma-framework, prison, solid, kholidays, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtwayland, qtx11extras, @@ -38,10 +38,16 @@ mkDerivation { propagatedUserEnvPkgs = [ qtgraphicaleffects ]; outputs = [ "out" "dev" ]; + cmakeFlags = [ + ''-DNIXPKGS_BREEZE_WALLPAPERS=${getBin breeze-qt5}/share/wallpapers'' + ]; + patches = [ ./0001-startkde.patch + ./0002-absolute-wallpaper-install-dir.patch ]; + NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' ''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"''