TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "gnu: syncthing: Prepare for cross-compiling."

Browse source 
This commit broke splitting the package into multiple outputs.

See <https://bugs.gnu.org/50071>.

This reverts commit b33f5d7ff0.
This commit is contained in:
Leo Famulari 2021-08-15 16:35:22 -04:00
parent 9455143907
commit a81dd42465
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/syncthing.scm
View file

@ -76,14 +76,6 @@ (define-public syncthing
(("120s") "999s"))
#t))
(add-before 'build 'pre-build
(lambda _
(with-directory-excursion "src/github.com/syncthing/syncthing"
;; Don't set a local GOBIN, it breaks cross compiling.
(substitute* "build.go"
((".*GOBIN.*") "")))
#t))
(replace 'build
(lambda _
(with-directory-excursion "src/github.com/syncthing/syncthing"
@ -92,7 +84,7 @@ (define-public syncthing
;; "build syncthing" again with -no-upgrade.
;; https://github.com/syncthing/syncthing/issues/6118
(invoke "go" "run" "build.go")
(for-each delete-file (find-files "../../../../bin" "syncthing"))
(delete-file "bin/syncthing")
(invoke "go" "run" "build.go" "-no-upgrade" "build" "syncthing"))))
(replace 'check
@ -106,11 +98,15 @@ (define-public syncthing
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(utils (assoc-ref outputs "utils")))
(with-directory-excursion "src/github.com/syncthing/syncthing"
(install-file "syncthing" (string-append out "/bin")))
(for-each (cut install-file <> (string-append utils "/bin/"))
(find-files "bin"))
#t)))
(with-directory-excursion "src/github.com/syncthing/syncthing/bin"
(install-file "../syncthing" (string-append out "/bin"))
(for-each (cut install-file <> (string-append utils "/bin/"))
'("stcompdirs" "stcrashreceiver"
"stdisco" "stdiscosrv" "stevents" "stfileinfo"
"stfinddevice" "stfindignored" "stgenfiles"
"stindex" "strelaypoolsrv" "strelaysrv" "stsigtool"
"stvanity" "stwatchfile" "uraggregate" "ursrv"))
#t))))
(add-after 'install 'install-docs
(lambda* (#:key outputs #:allow-other-keys)