me
/
guix
Archived
1
0
Fork 0
Code

gnu: bootstrap: Correctly handle patches that are origins. 

* gnu/packages/bootstrap.scm (bootstrap-origin): Rewrite the patches of
  SOURCES that are also origins.
master
Ludovic Courtès 2014-09-24 19:08:54 +02:00
parent 27afb11a22
commit ce517b20d4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/bootstrap.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -78,7 +78,14 @@
(boot url-fetch)) (boot url-fetch))
(else orig-method))) (else orig-method)))
(patch-guile %bootstrap-guile) (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) (define (package-from-tarball name source program-to-test description)
"Return a package that correspond to the extraction of SOURCE. "Return a package that correspond to the extraction of SOURCE.