packages: Simplify patch instantiation.

* guix/packages.scm (patch-and-repack)[instantiate-patch]: Use
'local-file' instead of 'interned-file'.  When PATCH is a struct, return
it.  Use 'let' instead of 'mlet'.

1 files changed, 12 insertions, 14 deletions

diff --git a/guix/packages.scm b/guix/packages.scm
index 171eb0b347..1b2728f033 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -642,21 +642,19 @@ specifies modules in scope when evaluating SNIPPET."
   (define instantiate-patch
     (match-lambda
       ((? string? patch)                          ;deprecated
-       (interned-file patch #:recursive? #t))
+       (local-file patch #:recursive? #t))
       ((? struct? patch)                          ;origin, local-file, etc.
-       (lower-object patch system))))
-
-  (mlet %store-monad ((tar ->     (lookup-input "tar"))
-                      (gzip ->    (lookup-input "gzip"))
-                      (bzip2 ->   (lookup-input "bzip2"))
-                      (lzip ->    (lookup-input "lzip"))
-                      (xz ->      (lookup-input "xz"))
-                      (patch ->   (lookup-input "patch"))
-                      (locales -> (lookup-input "locales"))
-                      (comp ->    (and=> (compressor source-file-name)
-                                         lookup-input))
-                      (patches    (sequence %store-monad
-                                            (map instantiate-patch patches))))
+       patch)))
+
+  (let ((tar     (lookup-input "tar"))
+        (gzip    (lookup-input "gzip"))
+        (bzip2   (lookup-input "bzip2"))
+        (lzip    (lookup-input "lzip"))
+        (xz      (lookup-input "xz"))
+        (patch   (lookup-input "patch"))
+        (locales (lookup-input "locales"))
+        (comp    (and=> (compressor source-file-name) lookup-input))
+        (patches (map instantiate-patch patches)))
     (define build
       (with-imported-modules '((guix build utils))
         #~(begin