01/04: derivations: 'map-derivation' no longer calls 'read-derivation-from-file'.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 1653b23564b7de02440820d07ed067318ebf13b4
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 3 22:27:17 2019 +0200

    derivations: 'map-derivation' no longer calls 'read-derivation-from-file'.
    
    This is a followup to 5cf4b26d52bcea382d98fb4becce89be9ee37b55.
    
    * guix/derivations.scm (map-derivation)[rewritten-input]: Avoid call to
    'read-derivation-from-file'.
---
 guix/derivations.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/guix/derivations.scm b/guix/derivations.scm
index 9cacca5..4e969cb 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -948,16 +948,14 @@ recursively."
       ;; in the format used in 'derivation' calls.
       (mlambda (input loop)
         (match input
-          (($ <derivation-input> (= derivation-file-name path)
-                                 (sub-drvs ...))
-           (match (vhash-assoc path mapping)
+          (($ <derivation-input> drv (sub-drvs ...))
+           (match (vhash-assoc (derivation-file-name drv) mapping)
              ((_ . (? derivation? replacement))
               (cons replacement sub-drvs))
              ((_ . replacement)
               (list replacement))
              (#f
-              (let* ((drv (loop (read-derivation-from-file path))))
-                (cons drv sub-drvs))))))))
+              (cons (loop drv) sub-drvs)))))))
 
     (let loop ((drv drv))
       (let* ((inputs       (map (cut rewritten-input <> loop)