From abf43d4511566e97f09049aa8b29453a2ed5ed16 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 25 May 2020 16:06:03 +0200
Subject: gexp: Fix expansion for (file-append (local-file ...) ...).

Fixes <https://bugs.gnu.org/41527>.
Regression introduced in d03001a31a6d460b712825640dba11e3f1a53a14.

* guix/gexp.scm (lower+expand-object): When LOWERED is not a struct and
EXPAND is true, call EXPAND.
* tests/gexp.scm ("file-append, raw store item"): New test.
---
 guix/gexp.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'guix')

diff --git a/guix/gexp.scm b/guix/gexp.scm
index 78b8af6fbc..9e193c76c4 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -270,7 +270,9 @@ (define* (lower+expand-object obj
              (if (not expand)
                  (loop lowered (lookup-expander lowered))
                  (return (expand obj lowered output)))
-             (return lowered)))))))               ;self-quoting
+             (if (not expand)                     ;self-quoting
+                 (return lowered)
+                 (return (expand obj lowered output)))))))))
 
 (define-syntax define-gexp-compiler
   (syntax-rules (=> compiler expander)
-- 
cgit v1.2.3