Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-11-28 19:24:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nonguix: Remove unnecessary modules from multiarch-container scripts.

Browse source 
* nonguix/multiarch-container.scm (packages->ld.so.conf)[computed-file]: Remove
with-imported-modules and use-modules.
(make-container-wrapper)[program-file]: Remove with-imported-modules.

Signed-off-by: ison <ison@airmail.cc>
This commit is contained in:
Attila Lendvai 2023-05-29 20:16:11 -06:00 committed by ison
parent c7cb7dc6e5
commit 5bc3c9da84
No known key found for this signature in database
GPG key ID: 5E76B1AD0FC22F93
1 changed files with 124 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nonguix/multiarch-container.scm
View file

@ -6,6 +6,7 @@
;;; Copyright © 2021 Kozo <kozodev@runbox.com>
;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2023 Attila Lendvai <attila@lendvai.name>
;;; The script provided by this package may optionally be started as
;;; a shell instead of automatically launching the wrapped entrypoint by setting
@ -161,12 +162,7 @@
in the Guix store"
(computed-file
"ld.so.conf"
(with-imported-modules
`((guix build union)
(guix build utils))
#~(begin
(use-modules (guix build union)
(guix build utils))
;; Need to quote "#$packages" as #$packages tries to "apply" the first item to the rest, like a procedure.
(let* ((packages '#$packages)
;; Add "/lib" to each package.
@ -184,7 +180,7 @@ in the Guix store"
(display directory port)
(newline port))
fhs-lib-dirs)))
#$output)))))
#$output))))
(define (nonguix-container->package container)
"Return a package with wrapper script to launch the supplied container object
@ -250,8 +246,6 @@ in a sandboxed FHS environment."
in a sandboxed FHS environment."
(program-file
(ngc-wrapper-name container)
(with-imported-modules
`((guix build utils))
#~(begin
(use-modules (guix build utils))
(define (preserve-var var)
@ -355,7 +349,7 @@ in a sandboxed FHS environment."
(add-path item #:writable? #t))
share)
"-m" ,manifest-file
,@command)))))))
,@command))))))
(define (make-container-manifest container fhs-internal)
"Return a scheme file-like object to be used as package manifest for FHS