me/guix
Archived
1
0
Fork 0
Code Activity

gnu: podman: Use G-expressions.

Browse source 
* gnu/packages/containers.scm (podman)[arguments]: Use G-expressions.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Zhu Zihao 2022-09-04 13:23:29 +08:00 • committed by Ludovic Courtès
parent 9f74add674
commit 14a450ae21
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 39 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/containers.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Timmy Douglas <mail@timmydouglas.com> ;;; Copyright © 2021 Timmy Douglas <mail@timmydouglas.com>
;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -284,11 +285,14 @@ configure network interfaces in Linux containers.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list ,(string-append "CC=" (cc-for-target)) (list
(string-append "PREFIX=" %output)) #:make-flags
#~(list #$(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" #$output))
#:tests? #f ; /sys/fs/cgroup not set up in guix sandbox #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox
#:test-target "test" #:test-target "test"
#:phases (modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-after 'unpack 'set-env (add-after 'unpack 'set-env
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -312,11 +316,11 @@ configure network interfaces in Linux containers.")
(string-append "CATATONIT_PATH=" (which "true")))) (string-append "CATATONIT_PATH=" (which "true"))))
(substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go" (substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go"
(("/usr/local/libexec/podman") (("/usr/local/libexec/podman")
(string-append (assoc-ref %outputs "out") "/bin"))) (string-append #$output "/bin")))
(substitute* "vendor/github.com/containers/common/pkg/config/default.go" (substitute* "vendor/github.com/containers/common/pkg/config/default.go"
(("/usr/libexec/podman/conmon") (which "conmon")) (("/usr/libexec/podman/conmon") (which "conmon"))
(("/usr/local/libexec/cni") (("/usr/local/libexec/cni")
(string-append (assoc-ref %build-inputs "cni-plugins") (string-append #$(this-package-input "cni-plugins")
"/bin")) "/bin"))
(("/usr/bin/crun") (which "crun")))))))) (("/usr/bin/crun") (which "crun"))))))))
(inputs (inputs