[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#71923] [PATCH 1/4] gnu: gvisor-tap-vsock: Fix build.
From: |
Jean-Pierre De Jesus DIAZ |
Subject: |
[bug#71923] [PATCH 1/4] gnu: gvisor-tap-vsock: Fix build. |
Date: |
Wed, 3 Jul 2024 18:36:40 +0200 |
* gnu/packages/containers.scm (gvisor-tap-vsock)<arguments>: Remove
'remove-go-references phase, add 'patch-go-reference phase and remove
imported modules.
Change-Id: I202292e303268b3ec0f13f19d4ceba517cd73aaa
---
gnu/packages/containers.scm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index c57f249ebd..396324284e 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -392,12 +392,15 @@ (define-public gvisor-tap-vsock
(list
#:make-flags `(list ,(string-append "GIT_VERSION=v" version))
#:test-target "test"
- #:imported-modules
- (source-module-closure `(,@%gnu-build-system-modules
- (guix build go-build-system)))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
+ ;; Add -trimpath flag to avoid keeping references to go package
+ ;; in the store.
+ (add-after 'unpack 'patch-go-reference
+ (lambda _
+ (substitute* "Makefile"
+ (("go build") "go build -trimpath"))))
(add-before 'build 'setenv
(lambda _
;; For golang toolchain.
@@ -408,9 +411,7 @@ (define-public gvisor-tap-vsock
(invoke "rm" "-r" "test")))
(replace 'install
(lambda _
- (install-file "bin/gvproxy" (string-append #$output "/bin"))))
- (add-after 'install 'remove-go-references
- (@@ (guix build go-build-system) remove-go-references)))))
+ (install-file "bin/gvproxy" (string-append #$output "/bin")))))))
(native-inputs (list go-1.20))
(home-page "https://github.com/containers/gvisor-tap-vsock")
(synopsis "Network stack for virtualization based on gVisor")
--
2.45.2
- [bug#71923] [PATCH 0/4] gnu: gvisor-tap-vsock, buildah, podman build fix., Jean-Pierre De Jesus DIAZ, 2024/07/03
- [bug#71923] [PATCH 1/4] gnu: gvisor-tap-vsock: Fix build.,
Jean-Pierre De Jesus DIAZ <=
- [bug#71923] [PATCH 2/4] gnu: podman: Fix build., Jean-Pierre De Jesus DIAZ, 2024/07/03
- [bug#71923] [PATCH 3/4] gnu: buildah: Fix build., Jean-Pierre De Jesus DIAZ, 2024/07/03
- [bug#71923] [PATCH 4/4] gnu: podman: Update to 5.1.1., Jean-Pierre De Jesus DIAZ, 2024/07/03
- [bug#71923] [PATCH 0/4] gnu: gvisor-tap-vsock, buildah, podman build fix., Sharlatan Hellseher, 2024/07/03
- [bug#71923] [PATCH 0/4] gnu: gvisor-tap-vsock, buildah, podman build fix., Sharlatan Hellseher, 2024/07/03
- bug#71923: [PATCH 0/4] gnu: gvisor-tap-vsock, buildah, podman build fix., Sharlatan Hellseher, 2024/07/03