branch master updated: gnu: syncthing-gtk: Make the autostart mechanism invoke the correct executable.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

lfam pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new c37559e819 gnu: syncthing-gtk: Make the autostart mechanism invoke the 
correct executable.
c37559e819 is described below

commit c37559e81979232feee07aa1eb39faacb093c5ca
Author: John Kehayias <john.kehayias@protonmail.com>
AuthorDate: Wed Jan 5 14:09:42 2022 -0500

    gnu: syncthing-gtk: Make the autostart mechanism invoke the correct 
executable.
    
    Fixes <https://issues.guix.gnu.org/50789>.
    
    * gnu/packages/syncthing.scm (syncthing-gtk)[arguments]: Add a
    'fix-autostart-path' phase.
---
 gnu/packages/syncthing.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 7125e70117..b05ef88982 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -171,6 +172,14 @@ Protocol.")
                  (substitute* "syncthing_gtk/configuration.py"
                    (("/usr/bin/syncthing") (string-append syncthing
                                                           
"/bin/syncthing"))))))
+           (add-after 'unpack 'fix-autostart-path
+             ;; Change the autostart .desktop file 'Exec' command so it finds
+             ;; the Python wrapper of 'syncthing-gtk', rather than the 
unwrapped
+             ;; '.syncthing-gtk-real'.
+             (lambda _
+               (substitute* "syncthing_gtk/tools.py"
+                 (("return executable")
+                   "return \"syncthing-gtk\""))))
            (add-after 'unpack 'remove-windows.py
              (lambda _
                ;; A Windows-specific module that fails to load with