ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: podman: Fix build.

Browse source 
* gnu/packages/containers.scm (podman)<arguments>: Remove
'remove-go-references phase, add BUILDFLAGS=-trimpath to make-flags and
remove imported modules.

Change-Id: I6ffca5bd5be21b8b61ea9aa50273f97c5e342f9d
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
This commit is contained in:
Jean-Pierre De Jesus DIAZ 2024-07-03 18:36:41 +02:00 committed by Sharlatan Hellseher
parent 13ae21cd05
commit 2dd43fdacc
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/containers.scm
View file

@ -474,12 +474,10 @@ (define-public podman
(string-append "PREFIX=" #$output)
(string-append "HELPER_BINARIES_DIR=" #$output "/_guix")
(string-append "GOMD2MAN="
#$go-github-com-go-md2man "/bin/go-md2man"))
#$go-github-com-go-md2man "/bin/go-md2man")
(string-append "BUILDFLAGS=-trimpath"))
#:tests? #f ; /sys/fs/cgroup not set up in guix sandbox
#:test-target "test"
#:imported-modules
(source-module-closure `(,@%gnu-build-system-modules
(guix build go-build-system)))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
@ -531,17 +529,6 @@ (define-public podman
,(string-append #$passt "/bin")
,(string-append #$procps "/bin") ; ps
"/run/setuid-programs")))))
(add-after 'install 'remove-go-references
(lambda* (#:key inputs #:allow-other-keys)
(let ((go (assoc-ref inputs "go")))
(for-each
(lambda (file)
(when (executable-file? file)
((@@ (guix build go-build-system) remove-store-reference)
file go)))
(append (find-files (string-append #$output "/bin"))
(find-files (string-append #$output "/libexec"))
(find-files (string-append #$output "/lib")))))))
(add-after 'install 'install-completions
(lambda _
(invoke "make" "install.completions"