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

scripts: Move 'set-build-options-from-command-line*' to (guix scripts build) module. 

* guix/scripts/build.scm (set-build-options-from-command-line*): New
  procedure.
* guix/scripts/environment.scm (set-build-options-from-command-line*): Delete.
This commit is contained in:
David Thompson 2015-05-20 18:48:10 -04:00
parent 4d043ab628
commit 2d977638c9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/scripts/build.scm
View File

@ -37,6 +37,7 @@
#:autoload (guix download) (download-to-store) #:autoload (guix download) (download-to-store)
#:export (%standard-build-options #:export (%standard-build-options
set-build-options-from-command-line set-build-options-from-command-line
set-build-options-from-command-line*
show-build-options-help show-build-options-help
guix-build)) guix-build))
@ -139,6 +140,9 @@ options handled by 'set-build-options-from-command-line', and listed in
#:print-build-trace (assoc-ref opts 'print-build-trace?) #:print-build-trace (assoc-ref opts 'print-build-trace?)
#:verbosity (assoc-ref opts 'verbosity))) #:verbosity (assoc-ref opts 'verbosity)))
(define set-build-options-from-command-line*
(store-lift set-build-options-from-command-line))
(define %standard-build-options (define %standard-build-options
;; List of standard command-line options for tools that build something. ;; List of standard command-line options for tools that build something.
(list (option '(#\L "load-path") #t #f (list (option '(#\L "load-path") #t #f

4
guix/scripts/environment.scm
View File

@ -191,10 +191,6 @@ packages."
(delete-duplicates (delete-duplicates
(append-map transitive-inputs packages))) (append-map transitive-inputs packages)))
;; TODO: Deduplicate these.
(define set-build-options-from-command-line*
(store-lift set-build-options-from-command-line))
(define (build-inputs inputs opts) (define (build-inputs inputs opts)
"Build the packages in INPUTS using the build options in OPTS." "Build the packages in INPUTS using the build options in OPTS."
(let ((substitutes? (assoc-ref opts 'substitutes?)) (let ((substitutes? (assoc-ref opts 'substitutes?))