mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 07:00:43 +00:00
plasma-workspace: Fix start_kdeinit_wrapper path
The plasma-workspace patch was mangled when the package was last updated. Resolves: #31686
This commit is contained in:
parent
5c5223d46b
commit
98457aca26
|
@ -617,10 +617,10 @@ index e9fa0bee..79e50a96 100644
|
|||
|
||||
echo 'startkde: Done.' 1>&2
|
||||
diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
|
||||
index fd232bdf..e1c8fff6 100644
|
||||
index 9f875110..2a7a2a70 100644
|
||||
--- a/startkde/startplasma.cmake
|
||||
+++ b/startkde/startplasma.cmake
|
||||
@@ -1,4 +1,4 @@
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
|
||||
|
@ -628,7 +628,7 @@ index fd232bdf..e1c8fff6 100644
|
|||
#
|
||||
|
||||
# Boot sequence:
|
||||
@@ -17,17 +17,13 @@
|
||||
@@ -17,28 +17,26 @@
|
||||
#
|
||||
# * Then ksmserver is started which takes control of the rest of the startup sequence
|
||||
|
||||
|
@ -644,14 +644,14 @@ index fd232bdf..e1c8fff6 100644
|
|||
|
||||
-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
|
||||
-
|
||||
-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
|
||||
-xrdb -quiet -merge -nocpp <<EOF
|
||||
+if [ "$kcmfonts_general_forcefontdpi" -ne 0 ]; then
|
||||
+ @NIXPKGS_XRDB@ -quiet -merge -nocpp <<EOF
|
||||
Xft.dpi: $kcmfonts_general_forcefontdpi
|
||||
Xft.dpi: $QT_WAYLAND_FORCE_DPI
|
||||
EOF
|
||||
fi
|
||||
@@ -36,11 +32,11 @@ dl=$DESKTOP_LOCKED
|
||||
+fi
|
||||
|
||||
dl=$DESKTOP_LOCKED
|
||||
unset DESKTOP_LOCKED # Don't want it in the environment
|
||||
|
||||
ksplash_pid=
|
||||
|
@ -665,7 +665,7 @@ index fd232bdf..e1c8fff6 100644
|
|||
;;
|
||||
None)
|
||||
;;
|
||||
@@ -52,48 +48,6 @@ fi
|
||||
@@ -50,48 +48,6 @@ fi
|
||||
#In wayland we want Plasma to use Qt's scaling
|
||||
export PLASMA_USE_QT_SCALING=1
|
||||
|
||||
|
@ -714,7 +714,7 @@ index fd232bdf..e1c8fff6 100644
|
|||
# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
|
||||
# from some users that they're confused and don't know what to do. This is
|
||||
# especially necessary on slow machines, where starting KDE takes one or two
|
||||
@@ -102,35 +56,25 @@ xset fp rehash
|
||||
@@ -100,35 +56,25 @@ xset fp rehash
|
||||
# If the user has overwritten fonts, the cursor font may be different now
|
||||
# so don't move this up.
|
||||
#
|
||||
|
@ -755,7 +755,7 @@ index fd232bdf..e1c8fff6 100644
|
|||
|
||||
# finally, give the session control to the session manager
|
||||
# see kdebase/ksmserver for the description of the rest of the startup sequence
|
||||
@@ -145,27 +89,26 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
|
||||
@@ -143,27 +89,26 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
|
||||
# If the session should be locked from the start (locked autologin),
|
||||
# lock now and do the rest of the KDE startup underneath the locker.
|
||||
KSMSERVEROPTIONS=" --no-lockscreen"
|
||||
|
@ -791,7 +791,7 @@ index fd232bdf..e1c8fff6 100644
|
|||
done
|
||||
break
|
||||
fi
|
||||
@@ -174,15 +117,17 @@ fi
|
||||
@@ -172,15 +117,17 @@ fi
|
||||
|
||||
echo 'startplasma: Shutting down...' 1>&2
|
||||
# just in case
|
||||
|
|
Loading…
Reference in a new issue