08/16: packages: Simplify patch instantiation.

[Ludovic Courtès]

civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.

commit ef7a0d0e81b47c7e0b9ea70178aaeec2c76fb108
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 25 15:31:37 2017 +0200

    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.
---
 guix/packages.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index 4f92ef2..3621cfe 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -478,17 +478,16 @@ 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))))
+       patch)))
 
   (mlet %store-monad ((tar ->     (lookup-input "tar"))
                       (xz ->      (lookup-input "xz"))
                       (patch ->   (lookup-input "patch"))
                       (locales -> (lookup-input "locales"))
                       (decomp ->  (lookup-input decompression-type))
-                      (patches    (sequence %store-monad
-                                            (map instantiate-patch patches))))
+                      (patches -> (map instantiate-patch patches)))
     (define build
       (with-imported-modules '((guix build utils))
         #~(begin