guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

46/172: gnu: kubo: Fix build.


From: guix-commits
Subject: 46/172: gnu: kubo: Fix build.
Date: Mon, 21 Oct 2024 17:30:29 -0400 (EDT)

sharlatan pushed a commit to branch go-team
in repository guix.

commit 3f3437f0fb1c3511da285e749e8777ee688eecb0
Author: Sharlatan Hellseher <sharlatanus@gmail.com>
AuthorDate: Sat Sep 14 21:57:08 2024 +0100

    gnu: kubo: Fix build.
    
    * gnu/packages/ipfs.scm (kubo): Fix build.
    [arguments]: <#:phases>: Swap 'fix-embed-go-libp2p-asm-util with
    'fix-embed-files, which implements generalized solution to fix embed
    files issue.
    
    Change-Id: I1cc9b6eaf7ca72c0cea81387c9b80853b22dcf83
---
 gnu/packages/ipfs.scm | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 25ef38ff37..d8dd8676fb 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -1133,15 +1133,26 @@ types.")
       #:import-path "github.com/ipfs/kubo/cmd/ipfs"
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-embed-go-libp2p-asn-util
+          ;; TODO: Implement it in go-build-system.
+          ;;
+          ;; This happens due to Golang can't determine the valid directory of
+          ;; the module of embed file which is symlinked during setup
+          ;; environment phase, but easy resolved after coping file from the
+          ;; store to the build directory of the current package, see details
+          ;; in Golang source:
+          ;;
+          ;; - URL: <https://github.com/golang/go/blob/>
+          ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454
+          ;; - file: src/cmd/go/internal/load/pkg.go#L2059
+          (add-after 'unpack 'fix-embed-files
             (lambda _
-              (delete-file
-               
"src/github.com/libp2p/go-libp2p-asn-util/sorted-network-list.bin")
-              (copy-file
-               (string-append
-                #$(this-package-input 
"go-github-com-libp2p-go-libp2p-asn-util")
-                
"/src/github.com/libp2p/go-libp2p-asn-util/sorted-network-list.bin")
-               
"src/github.com/libp2p/go-libp2p-asn-util/sorted-network-list.bin")))
+              (for-each (lambda (file)
+                          (let ((file-store-path (readlink file)))
+                            (delete-file file)
+                            (copy-recursively file-store-path file)))
+                        (find-files "src" (string-append
+                                           ".*(editions_defaults.binpb"
+                                           "|sorted-network-list.bin)$")))))
           ;; 
https://github.com/ipfs/kubo/blob/master/docs/command-completion.md
           (add-after 'install 'install-bashcompletion
             (lambda _



reply via email to

[Prev in Thread] Current Thread [Next in Thread]