nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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).
This commit is contained in:
Mark H Weaver 2018-03-16 05:17:30 -04:00
parent 812cee6a07
commit 00d9494d80
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
guix/packages.scm
View File

@ -566,17 +566,17 @@ specifies modules in scope when evaluating SNIPPET."
(for-each apply-patch '#+patches) (for-each apply-patch '#+patches)
(unless #+@(if snippet (unless #+(if snippet
#~((let ((module (make-fresh-user-module))) #~(let ((module (make-fresh-user-module)))
(module-use-interfaces! (module-use-interfaces!
module module
(map resolve-interface '#+modules)) (map resolve-interface '#+modules))
((@ (system base compile) compile) ((@ (system base compile) compile)
'#+snippet '#+snippet
#:to 'value #:to 'value
#:opts %auto-compilation-options #:opts %auto-compilation-options
#:env module))) #:env module))
#~()) #~#t)
(format (current-error-port) (format (current-error-port)
"snippet returned false, indicating failure~%")) "snippet returned false, indicating failure~%"))