2 files changed, 27 insertions, 16 deletions

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index f46abc44d62..0b78f07077b 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2023 Graham James Addis <graham@addis.org.uk>
 ;;; Copyright © 2023 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2024 Sebastian Dümcke <code@sam-d.com>
-;;; Copyright © 2024 Noé Lopez <noelopez@free.fr>
+;;; Copyright © 2024-2025 Noé Lopez <noelopez@free.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -81,7 +81,9 @@
             self-contained-appimage
 
             %formats
-            guix-pack))
+            guix-pack
+
+            wrapped-manifest))
 
 ;;; Commentary:
 
@@ -1397,6 +1399,13 @@ libfakechroot.so and related ld.so machinery as a fallback."
                          (apply wrapped-manifest-entry entry args))
                        (manifest-entry-dependencies entry)))))
 
+(define* (wrapped-manifest manifest #:rest args)
+  "Return the MANIFEST with its entries wrapped such that they are
+relocatable. Extra arguments are passed to wrapped-package."
+  (map-manifest-entries
+   (lambda (entry) (apply wrapped-manifest-entry entry args))
+   manifest))
+
 
 ;;;
 ;;; Command-line options.
@@ -1795,9 +1804,7 @@ Create a bundle of PACKAGE.\n"))
                                   ;; Note: We cannot honor '--bootstrap' here because
                                   ;; 'glibc-bootstrap' lacks 'libc.a'.
                                   (if relocatable?
-                                      (map-manifest-entries
-                                       (cut wrapped-manifest-entry <> #:proot? proot?)
-                                       manifest)
+                                      (wrapped-manifest manifest #:proot? proot?)
                                       manifest)))
                    (pack-format (assoc-ref opts 'format))
                    (extra-options (match pack-format
diff --git a/tests/pack.scm b/tests/pack.scm
index d0a1b72eb94..5422e156b90 100644
--- a/tests/pack.scm
+++ b/tests/pack.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2023 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2024 Noé Lopez <noelopez@free.fr>
+;;; Copyright © 2024-2025 Noé Lopez <noelopez@free.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -337,11 +337,13 @@
     (mlet* %store-monad
         ((guile   (set-guile-for-build (default-guile)))
          (profile -> (profile
-                      ;; When using '--appimage-extract-and-run', the dynamic
-                      ;; linker is necessary, hence glibc below.
-                      (content (packages->manifest (list hello glibc)))
-                      (hooks '())
-                      (locales? #f)))
+                       ;; When using '--appimage-extract-and-run', the dynamic
+                       ;; linker is necessary, hence glibc below.
+                       (content (wrapped-manifest
+                                 (packages->manifest (list hello glibc))))
+                       (relative-symlinks? #t)
+                       (hooks '())
+                       (locales? #f)))
          (image   (self-contained-appimage "hello-appimage" profile
                                            #:entry-point "bin/hello"
                                            #:extra-options
@@ -369,11 +371,13 @@
     (mlet* %store-monad
         ((guile   (set-guile-for-build (default-guile)))
          (profile -> (profile
-                      ;; When using '--appimage-extract-and-run', the dynamic
-                      ;; linker is necessary, hence glibc below.
-                      (content (packages->manifest (list guile-3.0 glibc)))
-                      (hooks '())
-                      (locales? #f)))
+                       ;; When using '--appimage-extract-and-run', the dynamic
+                       ;; linker is necessary, hence glibc below.
+                       (content (wrapped-manifest
+                                 (packages->manifest (list guile-3.0 glibc))))
+                       (relative-symlinks? #t)
+                       (hooks '())
+                       (locales? #f)))
          (image   (self-contained-appimage "guile-appimage" profile
                                            #:entry-point "bin/guile"
                                            #:localstatedir? #t