swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

plasma5.plasma-workspace: Fix path to SDDM theme background image

Browse source
This commit is contained in:
Thomas Tuegel 2020-02-05 20:08:40 -06:00
parent 33dfefad14
commit 27fc6620e9
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
3 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
View file

@ -1,7 +1,7 @@
From 1796822e4c97062b919a596ce13db68e2c46c7e8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Jan 2020 05:00:53 -0600
Subject: [PATCH] startkde
Subject: [PATCH 1/2] startkde
---
startkde/startplasma-waylandsession.cpp | 2 +-

22
pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch Normal file
View file

@ -0,0 +1,22 @@
From 7c6f939aea290bc3ec7629f26d02441d1d4bcb8a 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
---
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

18
pkgs/desktops/plasma-5/plasma-workspace/default.nix
View file

@ -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"''