From b446a604b491cf66cc818d50fa23461a37dc94a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 11 Dec 2019 23:50:13 +0100
Subject: [PATCH] DRAFT serialization: Avoid 'define-values', for the sake of
 Guile 2.0.

DRAFT: We should probably just use 'let-values' instead.

* guix/serialization.scm (define-values) [not guile-2.2]: New macro.
---
 guix/serialization.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/guix/serialization.scm b/guix/serialization.scm
index f793feb53dc..ceccd207aa7 100644
--- a/guix/serialization.scm
+++ b/guix/serialization.scm
@@ -287,6 +287,21 @@ order."
          string<?)
    string=?))
 
+(cond-expand
+  ((not guile-2.2)
+   ;; Guile 2.0 lacks 'define-values'.
+   (define-syntax define-values
+     (syntax-rules ()
+       ((_ (a b) exp)
+        (begin
+          (define a #f)
+          (define b #f)
+          (call-with-values (lambda () exp)
+            (lambda (x y)
+              (set! a x)
+              (set! b y))))))))
+  (else #t))
+
 (define* (write-file-tree file port
                           #:key
                           file-type+size