diff options
| author | Alex Vong <alexvong1995@gmail.com> | 2018-11-19 12:05:19 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2018-11-19 12:05:19 +0100 |
| commit | 53f316ab904196cf20673f34209664b6249cb646 (patch) | |
| tree | b8d14506b3e21388b2f0101a70c45086cec5ed35 /gnu/packages | |
| parent | d0ad97115abb548195b920e83ce2769b5020884d (diff) | |
| download | guix-53f316ab904196cf20673f34209664b6249cb646.tar.gz guix-53f316ab904196cf20673f34209664b6249cb646.zip | |
guix: Add clojure-utils.
* guix/build/clojure-utils.scm: New file.
* gnu/packages/lisp.scm (clojure)[arguments]: Use it.
* Makefile.am (MODULES): Add it.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/lisp.scm | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c33e4187c7..6b0de63986 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -600,6 +600,7 @@ interface.") (library-names (match libraries (((library-name _) ...) library-name)))) + (package (name "clojure") (version "1.9.0") @@ -613,11 +614,13 @@ interface.") (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha")))) (build-system ant-build-system) (arguments - `(#:modules ((guix build ant-build-system) + `(#:imported-modules ((guix build clojure-utils) + (guix build guile-build-system) + ,@%ant-build-system-modules) + #:modules ((guix build ant-build-system) + (guix build clojure-utils) (guix build java-utils) (guix build utils) - (ice-9 ftw) - (ice-9 regex) (srfi srfi-26)) #:test-target "test" #:phases @@ -643,18 +646,8 @@ interface.") #t)) (add-after 'build 'build-javadoc ant-build-javadoc) (replace 'install (install-jars "./")) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let ((doc-dir (string-append (assoc-ref outputs "out") - "/share/doc/clojure-" - ,version "/"))) - (copy-recursively "doc/clojure" doc-dir) - (for-each (cut install-file <> doc-dir) - (filter (cut string-match - ".*\\.(html|markdown|md|txt)" - <>) - (scandir "./"))) - #t))) + (add-after 'install-license-files 'install-doc + (cut install-doc #:doc-dirs '("doc/clojure/") <...>)) (add-after 'install-doc 'install-javadoc (install-javadoc "target/javadoc/"))))) (native-inputs libraries) |