diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/desktops/plasma-5/plasma-workspace | |
parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/desktops/plasma-5/plasma-workspace')
3 files changed, 26 insertions, 35 deletions
diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch index d230e1270bea..120800926296 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch @@ -1,4 +1,4 @@ -From 1796822e4c97062b919a596ce13db68e2c46c7e8 Mon Sep 17 00:00:00 2001 +From 6477e377fcca39c07ef5f91a55084d7d74715d00 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Tue, 28 Jan 2020 05:00:53 -0600 Subject: [PATCH 1/2] startkde @@ -6,11 +6,11 @@ Subject: [PATCH 1/2] startkde --- startkde/startplasma-waylandsession.cpp | 2 +- startkde/startplasma-x11.cpp | 2 +- - startkde/startplasma.cpp | 32 ++++++++----------------- - 3 files changed, 12 insertions(+), 24 deletions(-) + startkde/startplasma.cpp | 24 ++++++++++-------------- + 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp -index 87c71c6..5fc5314 100644 +index 87c71c6b3..5fc53140e 100644 --- a/startkde/startplasma-waylandsession.cpp +++ b/startkde/startplasma-waylandsession.cpp @@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/) @@ -23,7 +23,7 @@ index 87c71c6..5fc5314 100644 cleanupX11(); out << "startplasma-waylandsession: Done.\n"; diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp -index 3314b62..14cbe29 100644 +index 3314b6283..14cbe29fa 100644 --- a/startkde/startplasma-x11.cpp +++ b/startkde/startplasma-x11.cpp @@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/) @@ -36,7 +36,7 @@ index 3314b62..14cbe29 100644 cleanupPlasmaEnvironment(); cleanupX11(); diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index e0f7004..8ac41fd 100644 +index 4c9f5cef6..5ea4c2cf1 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -34,7 +34,7 @@ QTextStream out(stderr); @@ -48,22 +48,7 @@ index e0f7004..8ac41fd 100644 } 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() +@@ -242,15 +242,15 @@ void setupX11() // If the user has overwritten fonts, the cursor font may be different now // so don't move this up. @@ -84,7 +69,7 @@ index e0f7004..8ac41fd 100644 } // TODO: Check if Necessary -@@ -265,11 +257,7 @@ bool syncDBusEnvironment() +@@ -267,11 +267,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 @@ -97,7 +82,7 @@ index e0f7004..8ac41fd 100644 return exitCode == 0; } -@@ -285,7 +273,7 @@ void setupFontDpi() +@@ -287,7 +283,7 @@ void setupFontDpi() //TODO port to c++? const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); QProcess p; @@ -106,7 +91,7 @@ index e0f7004..8ac41fd 100644 p.setProcessChannelMode(QProcess::ForwardedChannels); p.write(input); p.closeWriteChannel(); -@@ -307,7 +295,7 @@ QProcess* setupKSplash() +@@ -309,7 +305,7 @@ QProcess* setupKSplash() KConfigGroup ksplashCfg = cfg.group("KSplash"); if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; @@ -115,7 +100,7 @@ index e0f7004..8ac41fd 100644 } } return p; -@@ -329,7 +317,7 @@ bool startKDEInit() +@@ -331,7 +327,7 @@ bool startKDEInit() { // We set LD_BIND_NOW to increase the efficiency of kdeinit. // kdeinit unsets this variable before loading applications. @@ -125,5 +110,5 @@ index e0f7004..8ac41fd 100644 messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation.")); return false; -- -2.23.1 +2.25.1 diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch index 8fa9e1d31cff..366707d27034 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch @@ -1,4 +1,4 @@ -From 7c6f939aea290bc3ec7629f26d02441d1d4bcb8a Mon Sep 17 00:00:00 2001 +From f43f15870f14b8fa17ba0765c0d7e2b225fafc3f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Wed, 5 Feb 2020 05:03:11 -0600 Subject: [PATCH 2/2] absolute-wallpaper-install-dir @@ -8,15 +8,16 @@ Subject: [PATCH 2/2] absolute-wallpaper-install-dir 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 +index 8494a5c8a..f723c1e1b 100644 --- a/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake -@@ -2,4 +2,4 @@ +@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg 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 +-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg ++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg + needsFullUserModel=false -- -2.23.1 +2.25.1 diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 6aa0e3b57382..8df146068cf2 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -11,7 +11,8 @@ 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, + phonon, plasma-framework, prison, solid, kholidays, kquickcharts, + appstream-qt, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtwayland, qtx11extras, @@ -31,7 +32,7 @@ mkDerivation { knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate networkmanager-qt phonon plasma-framework prison solid - kholidays + kholidays kquickcharts appstream-qt qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras ]; @@ -47,6 +48,10 @@ mkDerivation { ./0002-absolute-wallpaper-install-dir.patch ]; + postPatch = '' + substituteInPlace wallpapers/image/wallpaper.knsrc.cmake \ + --replace '@QtBinariesDir@/qdbus' ${getBin qttools}/bin/qdbus + ''; NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' |