Subject: [bug#68420] [PATCH 1/1] scripts: size: Add ‘system’ argument to ‘ensure-store-item’.

From: Hilton Chain <[email-masked]>
Date: Sat, 13 Jan 2024 15:29:33 +0800

This is a follow-up to c245a54aab348642178129a9aad501b81a3089b4.

‘%current-system’ is already parameterized within ‘run-with-store’, the root
cause is that ‘mlet*’ bindings are evaluated before the parameterization.

* guix/scripts/size.scm (ensure-store-item): Add ‘system’ argument and pass it
to ‘package->derivation’.
(guix-size): Adjust accordingly.

Change-Id: I910af7c137737bcd0ee079e57a81c4114ab5ae32
---
 guix/scripts/size.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm
index 8a8676a16f..0603c0498a 100644
--- a/guix/scripts/size.scm
+++ b/guix/scripts/size.scm
@@ -168,7 +168,7 @@ (define (store-profile items)
                (return (profile item size dependencies)))))
           sizes)))

-(define* (ensure-store-item spec-or-item)
+(define* (ensure-store-item spec-or-item #:optional (system (%current-system)))
   "Return a store file name.  If SPEC-OR-ITEM is a store file name, return it
 as is.  Otherwise, assume SPEC-OR-ITEM is a package output specification such
 as \"guile:debug\" or \"gcc-4.8\" and return its store file name."
@@ -177,7 +177,7 @@ (define* (ensure-store-item spec-or-item)
         (return spec-or-item)
         (let-values (((package output)
                       (specification->package+output spec-or-item)))
-          (mlet %store-monad ((drv (package->derivation package)))
+          (mlet %store-monad ((drv (package->derivation package system)))
             ;; Note: we don't try building DRV like 'guix archive' does
             ;; because we don't have to since we can instead rely on
             ;; substitute meta-data.
@@ -317,8 +317,7 @@ (define-command (guix-size . args)
           ;; Turn off grafts because (1) substitute servers do not serve grafted
           ;; packages, and (2) they do not make any difference on the
           ;; resulting size.
-          (parameterize ((%graft? #f)
-                         (%current-system system))
+          (parameterize ((%graft? #f))
             (with-store store
               (set-build-options store
                                  #:use-substitutes? #t
@@ -326,7 +325,9 @@ (define-command (guix-size . args)

               (run-with-store store
                 (mlet* %store-monad ((items   (mapm %store-monad
-                                                    ensure-store-item files))
+                                                    (cut ensure-store-item <>
+                                                         system)
+                                                  files))
                                      (profile (store-profile items)))
                   (if map-file
                       (begin
--
2.41.0