diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-07-17 09:43:11 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-07-17 09:45:19 +0100 |
| commit | 22b3a95f6eb375c9ca89af9eeee8ec9903abd557 (patch) | |
| tree | 474c1a4ad49d5e3d61efcfe13d7df92960fd9777 | |
| parent | 55b90c90532cd50617fb3dd56173f96de1cbe0b3 (diff) | |
| download | guix-22b3a95f6eb375c9ca89af9eeee8ec9903abd557.tar.gz | |
build-system/maven: Make default-maven-plugins a procedure.
This allows compiling the module without the (gnu packages maven) module being available. * guix/build-system/maven.scm (%default-maven-plugins): Rename to default-maven-plugins, and convert to a procedure. * doc/guix.texi (maven-build-system): Update.
| -rw-r--r-- | doc/guix.texi | 2 | ||||
| -rw-r--r-- | guix/build-system/maven.scm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 2041d10447..2c5c017eea 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6849,7 +6849,7 @@ corresponding argument, @code{#:jdk} and @code{#:maven}. The @code{#:maven-plugins} argument is a list of maven plugins used during the build, with the same format as the @code{inputs} fields of the package -declaration. Its default value is @code{%default-maven-plugins} which is +declaration. Its default value is @code{(default-maven-plugins)} which is also exported. @end defvr diff --git a/guix/build-system/maven.scm b/guix/build-system/maven.scm index 88ae1ce7bc..2dceefccc1 100644 --- a/guix/build-system/maven.scm +++ b/guix/build-system/maven.scm @@ -28,7 +28,7 @@ #:use-module (srfi srfi-1) #:export (%maven-build-system-modules default-maven - %default-maven-plugins + default-maven-plugins %default-exclude lower maven-build @@ -96,7 +96,7 @@ (let ((jdk-mod (resolve-interface '(gnu packages java)))) (module-ref jdk-mod 'icedtea))) -(define %default-maven-plugins +(define (default-maven-plugins) `(("maven-compiler-plugin" ,(default-maven-compiler-plugin)) ("maven-jar-plugin" ,(default-maven-jar-plugin)) ("maven-resources-plugin" ,(default-maven-resources-plugin)) @@ -112,7 +112,7 @@ #:key source inputs native-inputs outputs system target (maven (default-maven)) (jdk (default-jdk)) - (maven-plugins %default-maven-plugins) + (maven-plugins (default-maven-plugins)) (local-packages '()) (exclude %default-exclude) #:allow-other-keys |