diff options
| author | K900 <me@0upti.me> | 2022-09-15 19:23:51 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2022-10-12 17:15:56 +0300 |
| commit | 7e99c2ed5bf1bbb5752a6ebabeed65bd05e7cb71 (patch) | |
| tree | f2000bc162260ad606aa388e1e16a8cc58fe0d4c /pkgs/desktops/plasma-5/plasma-workspace | |
| parent | 9673ea736af82a37bd40243eb10c9557237ea5a6 (diff) | |
plasma5Packages: 5.25.5 -> 5.26.0
Diffstat (limited to 'pkgs/desktops/plasma-5/plasma-workspace')
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch | 22 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/default.nix | 15 |
2 files changed, 15 insertions, 22 deletions
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 index 211316e24736e..45c9f695b4520 100644 --- 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 @@ -1,23 +1,9 @@ -From 914d2ec5e669ecf8771cc1308028990f733fb8cc Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@mailbox.org> -Date: Wed, 5 Feb 2020 05:03:11 -0600 -Subject: [PATCH] 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 a560da3..f723c1e 100644 ---- a/sddm-theme/theme.conf.cmake -+++ b/sddm-theme/theme.conf.cmake +--- a/lookandfeel/sddm-theme/theme.conf.cmake ++++ b/lookandfeel/sddm-theme/theme.conf.cmake @@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg type=image color=#1d99f3 fontSize=10 --background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg -+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg +-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png ++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png needsFullUserModel=false --- -2.30.0 - diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index ce17561d73fc1..27fb2b0c594e9 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -12,10 +12,10 @@ kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt, phonon, plasma-framework, prison, solid, kholidays, kquickcharts, - appstream-qt, plasma-wayland-protocols, + appstream-qt, plasma-wayland-protocols, kpipewire, libkexiv2, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, - qtwayland, qtx11extras, qqc2-desktop-style, + qtwayland, qtx11extras, qqc2-desktop-style, polkit-qt, pipewire, libdrm }: @@ -35,10 +35,11 @@ mkDerivation { knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate networkmanager-qt phonon plasma-framework prison solid - kholidays kquickcharts appstream-qt plasma-wayland-protocols + kholidays kquickcharts appstream-qt plasma-wayland-protocols kpipewire + libkexiv2 qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland - qtx11extras qqc2-desktop-style + qtx11extras qqc2-desktop-style polkit-qt pipewire libdrm ]; @@ -60,6 +61,12 @@ mkDerivation { --replace 'ecm_query_qt(QtBinariesDir QT_INSTALL_BINS)' 'set(QtBinariesDir "${lib.getBin qttools}/bin")' ''; + # work around wrapQtAppsHook double-wrapping kcminit_startup, + # which is a symlink to kcminit + postFixup = '' + ln -sf $out/bin/kcminit $out/bin/kcminit_startup + ''; + NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"'' |