diff options
| author | Hilton Chain <hako@ultrarare.space> | 2025-01-22 17:42:39 +0800 |
|---|---|---|
| committer | Hilton Chain <hako@ultrarare.space> | 2025-04-05 07:57:49 +0800 |
| commit | 8096527af72b8baffbe43c1dafd3b5bb8083c17b (patch) | |
| tree | 7353546b8c0859db242bb07bf496ae1f617e7122 /nonguix | |
| parent | e4cbe318907d3432e3daf9a6058d7c518645e198 (diff) | |
nonguix: nonguix-container: Set more default values.
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.
Diffstat (limited to 'nonguix')
| -rw-r--r-- | nonguix/multiarch-container.scm | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index ca6f7ab..31ba57d 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -91,10 +91,24 @@ (manifest-name ngc-manifest-name (default "nonguix-container-manifest.scm")) (internal-name ngc-internal-name (default "fhs-internal")) (sandbox-home ngc-sandbox-home (default ".local/share/guix-sandbox-home")) - (ld.so.conf ngc-ld.so.conf) - (ld.so.cache ngc-ld.so.cache) - (union64 ngc-union64 (default '())) - (union32 ngc-union32 (default '())) + (ld.so.conf ngc-ld.so.conf + (default (packages->ld.so.conf + (list (ngc-union64 this-nonguix-container) + (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 '())) (exposed ngc-exposed (default '())) (shared ngc-shared (default '())) @@ -410,12 +424,12 @@ the exact path for the fhs-internal package." (item item)))) (manifest-add - (packages->manifest (list #$@(ngc-packages container))) + (packages->manifest '()) (map store-item->manifest-entry - '(#$(file-append (ngc-wrap-package container)) - #$(file-append (ngc-union64 container)) - #$(file-append (ngc-union32 container)) - #$(file-append fhs-internal))))))) + '(#$(ngc-wrap-package container) + #$(ngc-union64 container) + #$(ngc-union32 container) + #$fhs-internal)))))) (define (make-container-internal container) "Return a dummy package housing the fhs-internal script." |