From 27fc6620e9f99991bbaae78e15c5a0626af39e12 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 5 Feb 2020 20:08:40 -0600 Subject: [PATCH] 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"''