git.iko.soy/typeable/nixpkgs
on master help sign in
plasma5.plasma-workspace: Fix path to SDDM theme background image
commit27fc6620e9f99991bbaae78e15c5a0626af39e12 authorThomas Tuegel <ttuegel@mailbox.org> dateWed 5 Feb 2020, 20:08 (7 years ago) parent33dfefa
3 files changed+35−7
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch+1−1 pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch+22 pkgs/desktops/plasma-5/plasma-workspace/default.nix+12−6
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch+1−1
@@ -1,7 +1,7 @@
11From 1796822e4c97062b919a596ce13db68e2c46c7e8 Mon Sep 17 00:00:00 2001
22From: Thomas Tuegel <ttuegel@mailbox.org>
33Date: Tue, 28 Jan 2020 05:00:53 -0600
4−Subject: [PATCH] startkde
4+Subject: [PATCH 1/2] startkde
55
66---
77 startkde/startplasma-waylandsession.cpp | 2 +-
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+12−6
@@ -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, kactivities-stats, kcmutils, kconfig, kcrash, kdbusaddons,
10− kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, kinit,
11− kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner, kscreenlocker,
12− ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen,
13− libksysguard, libqalculate, networkmanager-qt, phonon, plasma-framework,
14− prison, solid, kholidays, 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,
@@ -38,10 +38,16 @@ mkDerivation {
3838 propagatedUserEnvPkgs = [ qtgraphicaleffects ];
3939 outputs = [ "out" "dev" ];
4040
41+ cmakeFlags = [
42+ ''-DNIXPKGS_BREEZE_WALLPAPERS=${getBin breeze-qt5}/share/wallpapers''
43+ ];
44+
4145 patches = [
4246 ./0001-startkde.patch
47+ ./0002-absolute-wallpaper-install-dir.patch
4348 ];
4449
50+
4551 NIX_CFLAGS_COMPILE = [
4652 ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"''
4753 ''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"''