Revert "gnu: syncthing: Prepare for cross-compiling."
This commit broke splitting the package into multiple outputs.
See <https://bugs.gnu.org/50071>.
This reverts commit b33f5d7ff0
.
master
parent
9455143907
commit
a81dd42465
|
@ -76,14 +76,6 @@
|
||||||
(("120s") "999s"))
|
(("120s") "999s"))
|
||||||
#t))
|
#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
|
(replace 'build
|
||||||
(lambda _
|
(lambda _
|
||||||
(with-directory-excursion "src/github.com/syncthing/syncthing"
|
(with-directory-excursion "src/github.com/syncthing/syncthing"
|
||||||
|
@ -92,7 +84,7 @@
|
||||||
;; "build syncthing" again with -no-upgrade.
|
;; "build syncthing" again with -no-upgrade.
|
||||||
;; https://github.com/syncthing/syncthing/issues/6118
|
;; https://github.com/syncthing/syncthing/issues/6118
|
||||||
(invoke "go" "run" "build.go")
|
(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"))))
|
(invoke "go" "run" "build.go" "-no-upgrade" "build" "syncthing"))))
|
||||||
|
|
||||||
(replace 'check
|
(replace 'check
|
||||||
|
@ -106,11 +98,15 @@
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let ((out (assoc-ref outputs "out"))
|
(let ((out (assoc-ref outputs "out"))
|
||||||
(utils (assoc-ref outputs "utils")))
|
(utils (assoc-ref outputs "utils")))
|
||||||
(with-directory-excursion "src/github.com/syncthing/syncthing"
|
(with-directory-excursion "src/github.com/syncthing/syncthing/bin"
|
||||||
(install-file "syncthing" (string-append out "/bin")))
|
(install-file "../syncthing" (string-append out "/bin"))
|
||||||
(for-each (cut install-file <> (string-append utils "/bin/"))
|
(for-each (cut install-file <> (string-append utils "/bin/"))
|
||||||
(find-files "bin"))
|
'("stcompdirs" "stcrashreceiver"
|
||||||
#t)))
|
"stdisco" "stdiscosrv" "stevents" "stfileinfo"
|
||||||
|
"stfinddevice" "stfindignored" "stgenfiles"
|
||||||
|
"stindex" "strelaypoolsrv" "strelaysrv" "stsigtool"
|
||||||
|
"stvanity" "stwatchfile" "uraggregate" "ursrv"))
|
||||||
|
#t))))
|
||||||
|
|
||||||
(add-after 'install 'install-docs
|
(add-after 'install 'install-docs
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
|
Reference in New Issue