diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-03-16 05:17:30 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-03-16 05:28:31 -0400 |
| commit | 00d9494d80d70aac8c42bfe1cb2b70349ad7c90c (patch) | |
| tree | 7a67ee14fa88fe0b25b84e78d01ea1af1005d328 | |
| parent | 812cee6a07cb4b4ba4724768f9e745e2b25fe931 (diff) | |
| download | guix-00d9494d80d70aac8c42bfe1cb2b70349ad7c90c.tar.gz guix-00d9494d80d70aac8c42bfe1cb2b70349ad7c90c.zip | |
packages: patch-and-repack: Fix snippet handling.
This is a followup to commit 5003aeaf2560d6ddebcf980a94785fba77e00f34.
* guix/packages.scm (patch-and-repack): For the snippet, generate a single
boolean expression for 'unless', instead of the list of expressions which had
previously been spliced into an 'and' form (prior to commit 5003aea).
| -rw-r--r-- | guix/packages.scm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index 41d98e1414..0e18f520a8 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -566,17 +566,17 @@ specifies modules in scope when evaluating SNIPPET." (for-each apply-patch '#+patches) - (unless #+@(if snippet - #~((let ((module (make-fresh-user-module))) - (module-use-interfaces! - module - (map resolve-interface '#+modules)) - ((@ (system base compile) compile) - '#+snippet - #:to 'value - #:opts %auto-compilation-options - #:env module))) - #~()) + (unless #+(if snippet + #~(let ((module (make-fresh-user-module))) + (module-use-interfaces! + module + (map resolve-interface '#+modules)) + ((@ (system base compile) compile) + '#+snippet + #:to 'value + #:opts %auto-compilation-options + #:env module)) + #~#t) (format (current-error-port) "snippet returned false, indicating failure~%")) |