nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

maint: Adjust 'check-final-inputs-self-contained' for glibc:static. 

This change is necessary to cope with
6dff905e51.

* build-aux/check-final-inputs-self-contained.scm (final-inputs): Change
'match' pattern to match (LABEL PACKAGE OUTPUT).
master
Ludovic Courtès 2018-03-25 00:22:53 +01:00
parent c91e0f1ab3
commit 4debffadb7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
build-aux/check-final-inputs-self-contained.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -33,23 +33,23 @@
(define (final-inputs store system) (define (final-inputs store system)
"Return the list of outputs directories of the final inputs for SYSTEM." "Return the list of outputs directories of the final inputs for SYSTEM."
(append-map (match-lambda (append-map (match-lambda
((name package) ((or (name package) (name package _))
(let ((drv (package-derivation store package system))) (let ((drv (package-derivation store package system)))
;; Libc's 'debug' output refers to gcc-cross-boot0, but it's ;; Libc's 'debug' output refers to gcc-cross-boot0, but it's
;; hard to avoid, so we tolerate it. This should be the ;; hard to avoid, so we tolerate it. This should be the
;; only exception. Likewise, 'bash:include' depends on ;; only exception. Likewise, 'bash:include' depends on
;; bootstrap-binaries via its 'Makefile.inc' (FIXME). ;; bootstrap-binaries via its 'Makefile.inc' (FIXME).
(filter-map (match-lambda (filter-map (match-lambda
(("debug" . directory) (("debug" . directory)
(if (string=? "glibc" (package-name package)) (if (string=? "glibc" (package-name package))
#f #f
directory)) directory))
(("include" . directory) (("include" . directory)
(if (string=? "bash" (package-name package)) (if (string=? "bash" (package-name package))
#f #f
directory)) directory))
((_ . directory) directory)) ((_ . directory) directory))
(derivation->output-paths drv))))) (derivation->output-paths drv)))))
%final-inputs)) %final-inputs))
(define (assert-valid-substitute substitute) (define (assert-valid-substitute substitute)