From ce517b20d4c80c5b59151fe20e887e3836f9dc57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 24 Sep 2014 19:08:54 +0200 Subject: [PATCH] gnu: bootstrap: Correctly handle patches that are origins. * gnu/packages/bootstrap.scm (bootstrap-origin): Rewrite the patches of SOURCES that are also origins. --- gnu/packages/bootstrap.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 981cde9f2b..71ccb19597 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès ;;; ;;; 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.