infra/nonguix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nonguix: nonguix-container: Set more default values.

Browse Source 
Since packages field of <nonguix-container> was never used (it's lowered to a
list of store paths, which doesn't suit packages->manifest's expectation), this
commit makes use of it to provide default value for various other fields:

packages -> union64 + union32 -> ld.so.conf -> ld.so.cache.

* nonguix/multiarch-container.scm (<nonguix-container>)[ld.so.conf,ld.so.cache]
[union64,union32]: Set default value.
(make-container-manifest): Remove ngc-packages reference.
This commit is contained in:
Hilton Chain 2025-01-22 17:42:39 +08:00
parent 566cf65f9c
commit e7efe1483a
No known key found for this signature in database
GPG Key ID: ACC66D09CA528292
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nonguix/multiarch-container.scm
View File

@ -91,10 +91,24 @@
(manifest-name ngc-manifest-name (default "nonguix-container-manifest.scm")) (manifest-name ngc-manifest-name (default "nonguix-container-manifest.scm"))
(internal-name ngc-internal-name (default "fhs-internal")) (internal-name ngc-internal-name (default "fhs-internal"))
(sandbox-home ngc-sandbox-home (default ".local/share/guix-sandbox-home")) (sandbox-home ngc-sandbox-home (default ".local/share/guix-sandbox-home"))
(ld.so.conf ngc-ld.so.conf) (ld.so.conf ngc-ld.so.conf
(ld.so.cache ngc-ld.so.cache) (default (packages->ld.so.conf
(union64 ngc-union64 (default '())) (list (ngc-union64 this-nonguix-container)
(union32 ngc-union32 (default '())) (ngc-union32 this-nonguix-container))))
(thunked))
(ld.so.cache ngc-ld.so.cache
(default (ld.so.conf->ld.so.cache
(ngc-ld.so.conf this-nonguix-container)))
(thunked))
(union64 ngc-union64
(default (fhs-union (ngc-packages this-nonguix-container)
#:name "fhs-union-64"))
(thunked))
(union32 ngc-union32
(default (fhs-union (ngc-packages this-nonguix-container)
#:name "fhs-union-32"
#:system "i686-linux"))
(thunked))
(preserved-env ngc-preserved-env (default '())) (preserved-env ngc-preserved-env (default '()))
(exposed ngc-exposed (default '())) (exposed ngc-exposed (default '()))
(shared ngc-shared (default '())) (shared ngc-shared (default '()))
@ -410,12 +424,12 @@ the exact path for the fhs-internal package."
(item item)))) (item item))))
(manifest-add (manifest-add
(packages->manifest (list #$@(ngc-packages container))) (packages->manifest '())
(map store-item->manifest-entry (map store-item->manifest-entry
'(#$(file-append (ngc-wrap-package container)) '(#$(ngc-wrap-package container)
#$(file-append (ngc-union64 container)) #$(ngc-union64 container)
#$(file-append (ngc-union32 container)) #$(ngc-union32 container)
#$(file-append fhs-internal))))))) #$fhs-internal))))))
(define (make-container-internal container) (define (make-container-internal container)
"Return a dummy package housing the fhs-internal script." "Return a dummy package housing the fhs-internal script."