sharlatan pushed a commit to branch master
in repository guix.
commit caf5cfaa0dc0bacd45e0406ddc30bca0e4e4eece
Author: Sharlatan Hellseher <sharlata...@gmail.com>
AuthorDate: Wed Jun 19 22:23:00 2024 +0100
gnu: skopeo: Apply "-trimpath" flag.
* gnu/packages/virtualization.scm (skopeo) [arguments]: <#:make-flags>:
Add "-trimpath" to replace 'remove-go-references phase.
<#:phases>: Remove 'remove-go-references phase.
Change-Id: Idab669576282c81d55ec989dc1a64e87b89699ee
---
gnu/packages/virtualization.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 16c2b75510..4ff9676e79 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2319,6 +2319,7 @@ Open Container Initiative (OCI) image layout and its
tagged images.")
#~(list (string-append "CC=" #$(cc-for-target))
"PREFIX="
(string-append "DESTDIR=" #$output)
+ "GOGCFLAGS=-trimpath"
(string-append "GOMD2MAN="
#$go-github-com-go-md2man "/bin/go-md2man"))
#:tests? #f ; The tests require Docker
@@ -2357,9 +2358,7 @@ Open Container Initiative (OCI) image layout and its
tagged images.")
(wrap-program (string-append #$output "/bin/skopeo")
`("PATH" suffix
;; We need at least newuidmap, newgidmap and mount.
- ("/run/setuid-programs")))))
- (add-after 'install 'remove-go-references
- (@@ (guix build go-build-system) remove-go-references)))))
+ ("/run/setuid-programs"))))))))
(home-page "https://github.com/containers/skopeo";)
(synopsis "Interact with container images and container image registries")
(description
