Browse Source

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.
gn-latest-20200428
Ludovic Courtès 3 years ago
parent
commit
1458f768c1
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
1 changed files with 12 additions and 2 deletions
  1. +12
    -2
      guix/self.scm

+ 12
- 2
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*)
#:extensions dependencies
#: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))
@ -482,6 +487,11 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'."
(define (imported-files name files)
;; This is a non-monadic, simplified version of 'imported-files' from (guix
;; gexp).
(define same-target?
(match-lambda*
(((file1 . _) (file2 . _))
(string=? file1 file2))))
(define build
(with-imported-modules (source-module-closure
'((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
;; 'add-to-store'.
(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.
(computed-file name build


Loading…
Cancel
Save