aboutsummaryrefslogtreecommitdiff
path: root/guix/scripts
diff options
context:
space:
mode:
authornebuli <nebu@kipple>2014-11-30 17:47:22 +0100
committerLudovic Courtès <ludo@gnu.org>2014-11-30 18:54:07 +0100
commit16eb115ef4986f319e6aebb04cefce12bc851e01 (patch)
treed3f456766d9b90dd8f7e555a576457937e044918 /guix/scripts
parent6efc160efe6b91dd2ef2b74d551411d290c3b1f6 (diff)
downloadgnu-guix-16eb115ef4986f319e6aebb04cefce12bc851e01.tar
gnu-guix-16eb115ef4986f319e6aebb04cefce12bc851e01.tar.gz
guix: scripts: Add GUIX_BUILD_OPTIONS environment handling.
* doc/guix.texi (Invoking guix build): Mention 'GUIX_BUILD_OPTIONS'. * guix/scripts/archive.scm: (append args (environment-build-options)). * guix/scripts/build.scm: Ditto. * guix/scripts/environment.scm: Ditto. * guix/scripts/package.scm: Ditto. * guix/scripts/system.scm: Ditto. * guix/ui.scm (environment-build-options): New function. * guix/utils.scm (arguments-from-environment-variable): New function. * tests/guix-build.sh: Add tests. * test-env.in: Unset GUIX_BUILD_OPTIONS. Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'guix/scripts')
-rw-r--r--guix/scripts/archive.scm3
-rw-r--r--guix/scripts/build.scm3
-rw-r--r--guix/scripts/environment.scm3
-rw-r--r--guix/scripts/package.scm3
-rw-r--r--guix/scripts/system.scm3
5 files changed, 10 insertions, 5 deletions
diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm
index 84904e29da..29a3ad15a7 100644
--- a/guix/scripts/archive.scm
+++ b/guix/scripts/archive.scm
@@ -293,7 +293,8 @@ the input port."
(define (guix-archive . args)
(define (parse-options)
;; Return the alist of option values.
- (args-fold* args %options
+ (args-fold* (append args (environment-build-options))
+ %options
(lambda (opt name arg result)
(leave (_ "~A: unrecognized option~%") name))
(lambda (arg result)
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index b4aa33b3a0..76a743f0b3 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -401,7 +401,8 @@ arguments with packages that use the specified source."
(define (guix-build . args)
(define (parse-options)
;; Return the alist of option values.
- (args-fold* args %options
+ (args-fold* (append args (environment-build-options))
+ %options
(lambda (opt name arg result)
(leave (_ "~A: unrecognized option~%") name))
(lambda (arg result)
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 81bad963f6..a309dfa362 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -213,7 +213,8 @@ packages."
;; Entry point.
(define (guix-environment . args)
(define (parse-options)
- (args-fold* args %options
+ (args-fold* (append args (environment-build-options))
+ %options
(lambda (opt name arg result)
(leave (_ "~A: unrecognized option~%") name))
(lambda (arg result)
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 3a72053766..9ff4d17bf4 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -668,7 +668,8 @@ removed from MANIFEST."
(define (guix-package . args)
(define (parse-options)
;; Return the alist of option values.
- (args-fold* args %options
+ (args-fold* (append args (environment-build-options))
+ %options
(lambda (opt name arg result arg-handler)
(leave (_ "~A: unrecognized option~%") name))
(lambda (arg result arg-handler)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 398a5a371b..8ea77e4f3c 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -467,7 +467,8 @@ Build the operating system declared in FILE according to ACTION.\n"))
(define (guix-system . args)
(define (parse-options)
;; Return the alist of option values.
- (args-fold* args %options
+ (args-fold* (append args (environment-build-options))
+ %options
(lambda (opt name arg result)
(leave (_ "~A: unrecognized option~%") name))
(lambda (arg result)