diff options
| author | Ludovic Courtès | 2012-06-16 16:56:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès | 2012-06-16 17:02:19 +0200 |
| commit | 5dcfdcaa79800530c4b7ea520b5eb984a5e6b7ca (patch) | |
| tree | 01b214a31b80e1ef7531dc6ee6bb4c3698170598 /guix/gnu-build-system.scm | |
| parent | 3ab892fffe547c9ae579f2583758b7638d40a2f6 (diff) | |
gnu-build-system: Structure as a customizable sequence of phases.
* guix/build/gnu-build-system.scm (set-paths, build, check, install):
New procedures.
(unpack): Make `source' a keyword arg; add `#:allow-other-keys'.
(configure): Likewise.
(%standard-phases): New variable.
(gnu-build): Make `source', `outputs', and `inputs' keyword arguments;
add `phases' keyword argument; #:allow-other-keys; add rest arguments
`args'. Invoke each of PHASES in order within `every'.
* guix/gnu-build-system.scm (gnu-build): Add `make-flags' and `phases'
keyword arguments. Update builder's `gnu-build' call to match the new
convention.
Diffstat (limited to 'guix/gnu-build-system.scm')
| -rw-r--r-- | guix/gnu-build-system.scm | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/guix/gnu-build-system.scm b/guix/gnu-build-system.scm index a072c173f..0311aaa76 100644 --- a/guix/gnu-build-system.scm +++ b/guix/gnu-build-system.scm @@ -39,18 +39,21 @@ (define* (gnu-build store name source inputs #:key (outputs '("out")) (configure-flags '()) + (make-flags '()) (phases '%standard-phases) (system (%current-system))) "Return a derivation called NAME that builds from tarball SOURCE, with input derivation INPUTS, using the usual procedure of the GNU Build System." (define builder `(begin (use-modules (guix build gnu-build-system)) - (gnu-build ,(if (derivation-path? source) - (derivation-path->output-path source) - source) - %outputs - %build-inputs - #:configure-flags ',configure-flags))) + (gnu-build #:source ,(if (derivation-path? source) + (derivation-path->output-path source) + source) + #:outputs %outputs + #:inputs %build-inputs + #:phases ,phases + #:configure-flags ',configure-flags + #:make-flags ',make-flags))) (build-expression->derivation store name system builder |