From e7efe1483a198328c4646425cc8e846c38915d0d Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Wed, 22 Jan 2025 17:42:39 +0800
Subject: [PATCH] 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.
---
 nonguix/multiarch-container.scm | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm
index 15dd054..403f1a5 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."