~ruther/guix-local: gnu: bootstrap: Correctly handle patches that are origins.

ce517b20d4c80c5b59151fe20e887e3836f9dc57 — Ludovic Courtès 11 years ago 27afb11

gnu: bootstrap: Correctly handle patches that are origins.

* gnu/packages/bootstrap.scm (bootstrap-origin): Rewrite the patches of
  SOURCES that are also origins.

patch browse .tar.gz

1 files changed, 9 insertions(+), 2 deletions(-)

M gnu/packages/bootstrap.scm

M gnu/packages/bootstrap.scm => gnu/packages/bootstrap.scm +9 -2

@@ 1,5 1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;


@@ 78,7 78,14 @@
                      (boot url-fetch))
                     (else orig-method)))
       (patch-guile %bootstrap-guile)
-      (patch-inputs %bootstrap-patch-inputs))))
+      (patch-inputs %bootstrap-patch-inputs)
+
+      ;; Patches can be origins as well, so process them.
+      (patches (map (match-lambda
+                     ((? origin? patch)
+                      (bootstrap-origin patch))
+                     (patch patch))
+                    (origin-patches source))))))
 
 (define (package-from-tarball name source program-to-test description)
   "Return a package that correspond to the extraction of SOURCE.