me
/
guix
Archived
1
0
Fork 0
Code

self: Include gnu/build/* in the result. 

Previously, modules like gnu/build/cross-toolchain.scm or
gnu/build/svg.scm were missing from the result.

* guix/self.scm (compiled-guix)[*system-modules*]: Add gnu/build/* to
 #:extra-files.
(imported-files)[same-target?]: New procedure.
[build]: Call 'delete-duplicates' on FILES.
master
Ludovic Courtès 2018-06-02 00:04:39 +02:00
parent 8031b3fa3c
commit 1458f768c1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
guix/self.scm
View File

@ -314,7 +314,12 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'."
*extra-modules* *core-modules*) *extra-modules* *core-modules*)
#:extensions dependencies #:extensions dependencies
#:extra-files #:extra-files
(file-imports source "gnu/system/examples" (const #t)) (append (file-imports source "gnu/system/examples"
(const #t))
;; Build-side code that we don't build. Some of
;; these depend on guile-rsvg, the Shepherd, etc.
(file-imports source "gnu/build" (const #t)))
#:guile-for-build #:guile-for-build
guile-for-build)) guile-for-build))
@ -482,6 +487,11 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'."
(define (imported-files name files) (define (imported-files name files)
;; This is a non-monadic, simplified version of 'imported-files' from (guix ;; This is a non-monadic, simplified version of 'imported-files' from (guix
;; gexp). ;; gexp).
(define same-target?
(match-lambda*
(((file1 . _) (file2 . _))
(string=? file1 file2))))
(define build (define build
(with-imported-modules (source-module-closure (with-imported-modules (source-module-closure
'((guix build utils))) '((guix build utils)))
@ -498,7 +508,7 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'."
;; symlinks, as this makes a difference for ;; symlinks, as this makes a difference for
;; 'add-to-store'. ;; 'add-to-store'.
(copy-file store-path final-path))) (copy-file store-path final-path)))
'#$files)))) '#$(delete-duplicates files same-target?)))))
;; We're just copying files around, no need to substitute or offload it. ;; We're just copying files around, no need to substitute or offload it.
(computed-file name build (computed-file name build