me/guix
Archived
1
0
Fork 0
Code Activity

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

Browse source 
Fixes <https://issues.guix.gnu.org/50789>.

* gnu/packages/syncthing.scm (syncthing-gtk)[arguments]: Add a
'fix-autostart-path' phase.
This commit is contained in:
John Kehayias 2022-01-05 14:09:42 -05:00 • committed by Leo Famulari
parent f5da992b16
commit c37559e819
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/syncthing.scm
View file

@ -6,6 +6,7 @@
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -171,6 +172,14 @@ Protocol.")
(substitute* "syncthing_gtk/configuration.py" (substitute* "syncthing_gtk/configuration.py"
(("/usr/bin/syncthing") (string-append syncthing (("/usr/bin/syncthing") (string-append syncthing
"/bin/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 (add-after 'unpack 'remove-windows.py
(lambda _ (lambda _
;; A Windows-specific module that fails to load with ;; A Windows-specific module that fails to load with