diff options
| author | Robert Djubek <envy1988@gmail.com> | 2019-12-02 09:02:21 +0000 |
|---|---|---|
| committer | Robert Djubek <envy1988@gmail.com> | 2019-12-02 09:09:54 +0000 |
| commit | 7fe41e32a1578885473f315568b8382ca2ac5f3d (patch) | |
| tree | 6696ead3bbd77ef55ebae4161ad01a419cc8254b /pkgs/desktops/plasma-5 | |
| parent | 006da38a3b5dfcdf410ad3a7ebfba638ff81d43b (diff) | |
| download | nixpkgs-7fe41e32a1578885473f315568b8382ca2ac5f3d.tar nixpkgs-7fe41e32a1578885473f315568b8382ca2ac5f3d.tar.gz nixpkgs-7fe41e32a1578885473f315568b8382ca2ac5f3d.tar.bz2 nixpkgs-7fe41e32a1578885473f315568b8382ca2ac5f3d.tar.lz nixpkgs-7fe41e32a1578885473f315568b8382ca2ac5f3d.tar.xz nixpkgs-7fe41e32a1578885473f315568b8382ca2ac5f3d.tar.zst nixpkgs-7fe41e32a1578885473f315568b8382ca2ac5f3d.zip | |
plasma5.plasma-workspace: fix patch
At some point a patch accidentally removed ``` done break ``` from an if then/while loop in `startkde`. Which still breaks, but not the way we want... plasma-workspace-5.16.5/bin/startkde: line 403: syntax error near unexpected token `fi' plasma-workspace-5.16.5/bin/startkde: line 403: ` fi'
Diffstat (limited to 'pkgs/desktops/plasma-5')
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 5c27eee5010..5159328ed3f 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -1,9 +1,8 @@ diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake -index 69d3070..52e9102 100644 +index ea9a943..f98ddd2 100644 --- a/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake -@@ -1,5 +1,5 @@ - [General] +@@ -2,4 +2,4 @@ type=image color=#1d99f3 fontSize=10 @@ -37,7 +36,7 @@ index 493218e..d507aa5 100644 + return system( NIXPKGS_KDOSTARTUPCONFIG5 ); } diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index b68f0c6..a0ec214 100644 +index b68f0c6..97a13a1 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,22 +1,31 @@ @@ -443,7 +442,7 @@ index b68f0c6..a0ec214 100644 if test $? -eq 255; then # Startup error echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 -@@ -286,36 +387,36 @@ fi +@@ -286,19 +387,19 @@ fi #Anything after here is logout #It is not called after shutdown/restart @@ -465,13 +464,12 @@ index b68f0c6..a0ec214 100644 # ask remaining drkonqis to die in a graceful way - qdbus | grep 'org.kde.drkonqi-' | while read address ; do - qdbus "$address" "/MainApplication" "quit" -- done -- break + @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do + @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit" + done + break fi - done - fi +@@ -307,15 +408,17 @@ fi echo 'startkde: Shutting down...' 1>&2 # just in case @@ -1008,5 +1006,3 @@ index dcb473a..0988740 100644 echo 'startplasmacompositor: Shutting down...' 1>&2 --- -2.19.2 |