summaryrefslogtreecommitdiff
path: root/guix/grafts.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-08-21 15:09:11 +0200
committerLudovic Courtès <ludo@gnu.org>2018-08-24 17:57:56 +0200
commite4297aa8b95cefa32e2595ce58886fc03b0561f7 (patch)
tree046d7b6624b660cf0eb5c75514f1e42b74c473a0 /guix/grafts.scm
parentc1352b4badd2020448eb69e6ae212b43f5dceb15 (diff)
grafts: Add high-level 'graft' procedure on the build side.
* guix/build/graft.scm (graft): New procedure. * guix/grafts.scm (graft-derivation/shallow)[build]: Use it instead of inline code.
Diffstat (limited to 'guix/grafts.scm')
-rw-r--r--guix/grafts.scm13
1 files changed, 2 insertions, 11 deletions
diff --git a/guix/grafts.scm b/guix/grafts.scm
index d6b0e93e8d..4b10b3efd7 100644
--- a/guix/grafts.scm
+++ b/guix/grafts.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -117,16 +117,7 @@ are not recursively applied to dependencies of DRV."
(cons (assoc-ref old-outputs name)
file)))
%outputs))))
- (for-each (lambda (input output)
- (format #t "grafting '~a' -> '~a'...~%" input output)
- (force-output)
- (rewrite-directory input output mapping))
- (match old-outputs
- (((names . files) ...)
- files))
- (match %outputs
- (((names . files) ...)
- files))))))
+ (graft old-outputs %outputs mapping))))
(define add-label
(cut cons "x" <>))