guix_mirror_bot pushed a commit to branch master
in repository guix.

commit b27066594408d89351b6e0f4706eb4fdf24dbf26
Author: Efraim Flashner <[email protected]>
AuthorDate: Wed Jan 14 10:35:37 2026 +0200

    gnu: syncthing: Enable cross compiling.
    
    * gnu/packages/syncthing.scm (syncthing)[arguments]: Adjust the 'build
    phase to explicitly build all targets.  Adjust the 'install phase
    accordingly.
    
    Change-Id: I1a570b5ff56c2d4d2c131d47c3a6e2ca209ceb86
    Signed-off-by: Efraim Flashner <[email protected]>
---
 gnu/packages/syncthing.scm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 3b5aefe67f..74c9d8d31e 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2016 Petter <[email protected]>
 ;;; Copyright © 2016-2021, 2024 Leo Famulari <[email protected]>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <[email protected]>
-;;; Copyright © 2020-2022 Efraim Flashner <[email protected]>
+;;; Copyright © 2020-2022, 2026 Efraim Flashner <[email protected]>
 ;;; Copyright © 2020 Giacomo Leidi <[email protected]>
 ;;; Copyright © 2021 Maxim Cournoyer <[email protected]>
 ;;; Copyright © 2021 Arun Isaac <[email protected]>
@@ -85,11 +85,11 @@
              (lambda _
                (with-directory-excursion "src/github.com/syncthing/syncthing"
                  ; Build the primary Syncthing executable
-                 (invoke "go" "run" "build.go" "-no-upgrade")
+                 (invoke "go" "run" "build.go" "-no-upgrade" "build" 
"syncthing")
                  ; Build utilities used to run an independent Syncthing network
                  (for-each (cut invoke "go" "run" "build.go" "build" <>)
                            '("stcrashreceiver" "strelaypoolsrv" "stupgrades"
-                             "ursrv")))))
+                             "strelaysrv" "stdiscosrv" "ursrv")))))
 
            (replace 'check
              (lambda* (#:key tests? #:allow-other-keys)
@@ -99,13 +99,11 @@
 
            (replace 'install
              (lambda _
-               (with-directory-excursion 
"src/github.com/syncthing/syncthing/bin"
-                 (install-file "syncthing" (string-append #$output "/bin"))
-                 (for-each (cut install-file <> (string-append #$output:utils 
"/bin/"))
-                           '("stdiscosrv" "strelaysrv")))
                (with-directory-excursion "src/github.com/syncthing/syncthing"
+                 (install-file "syncthing" (string-append #$output "/bin"))
                  (for-each (cut install-file <> (string-append #$output:utils 
"/bin/"))
-                           '("ursrv" "stupgrades" "strelaypoolsrv" 
"stcrashreceiver")))))
+                           '("stdiscosrv" "strelaysrv" "ursrv" "stupgrades"
+                             "strelaypoolsrv" "stcrashreceiver")))))
 
            (add-after 'install 'install-docs
              (lambda _

Reply via email to