diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-12-14 11:55:07 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-12-14 11:55:07 +0100 |
| commit | c4a1b6c2ba479c6abcd22cab6a1fcd560469e986 (patch) | |
| tree | 057fb773fcac4200ea66a0267a818be61cca3104 /guix/scripts/environment.scm | |
| parent | 2ed11b3a3e05549ed6ef8a604464f424c0eeae1c (diff) | |
| parent | 45c5b47b96a238c764c2d32966267f7f897bcc3d (diff) | |
Merge branch 'master' into 'core-updates'.
Diffstat (limited to 'guix/scripts/environment.scm')
| -rw-r--r-- | guix/scripts/environment.scm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 81bad963f6..c388b0c52c 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -213,6 +213,12 @@ packages." ;; Entry point. (define (guix-environment . args) (define (parse-options) + ;; Return the alist of option values. + (append (parse-options-from args) + (parse-options-from (environment-build-options)))) + + (define (parse-options-from args) + ;; Actual parsing takes place here. (args-fold* args %options (lambda (opt name arg result) (leave (_ "~A: unrecognized option~%") name)) |