From 8e77f41ede94be3e3a80f0f19810aac954609eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 27 Apr 2013 23:02:06 +0200 Subject: [PATCH] packages: Work around compiler bug in Guile 2.0.5. * guix/packages.scm (package-field-location): Work around compiler bug in 2.0.5. Reported by Andreas Enge . --- guix/packages.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index ec5420f6c0..e8ae2fb817 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -181,9 +181,12 @@ representation." (let ((field (assoc field inits))) (match field ((_ value) - (and=> (or (source-properties value) - (source-properties field)) - source-properties->location)) + ;; Put the `or' here, and not in the first argument of + ;; `and=>', to work around a compiler bug in 2.0.5. + (or (and=> (source-properties value) + source-properties->location) + (and=> (source-properties field) + source-properties->location))) (_ #f)))) (_