summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorReily Siegel <mail@reilysiegel.com>2021-12-23 18:04:50 -0500
committerRicardo Wurmus <rekado@elephly.net>2022-01-12 17:43:03 +0100
commit9fe48723c8266ffe8e6a639be2ec2e362cf20cb5 (patch)
treedef78685bbbee80cdcf722ce90d590d13f0dce3b /gnu/packages
parent8cf2817d4c2e0ab8c7ab219be444f6ffa2970549 (diff)
downloadguix-9fe48723c8266ffe8e6a639be2ec2e362cf20cb5.tar.gz
gnu: clojure: Remove wrapper in favor of using clojure-tools.
* gnu/packages/clojure.scm (clojure)[arguments]: Remove generated wrapper
around clojure.jar, as it conflicts with the clojure-tools package.

Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/clojure.scm18
1 files changed, 1 insertions, 17 deletions
diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm
index cb8a7a2cbe..f728083eb2 100644
--- a/gnu/packages/clojure.scm
+++ b/gnu/packages/clojure.scm
@@ -121,23 +121,7 @@
            (add-after 'install-license-files 'install-doc
              (cut install-doc #:doc-dirs '("doc/clojure/") <...>))
            (add-after 'install-doc 'install-javadoc
-             (install-javadoc "target/javadoc/"))
-           (add-after 'install 'make-wrapper
-             (lambda* (#:key inputs outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (wrapper (string-append out "/bin/clojure")))
-                 (mkdir-p (string-append out "/bin"))
-                 (with-output-to-file wrapper
-                   (lambda _
-                     (display
-                      (string-append
-                       "#!"
-                       (which "sh")
-                       "\n\n"
-                       (assoc-ref inputs "jre") "/bin/java -jar "
-                       out "/share/java/clojure.jar \"$@\"\n"))))
-                 (chmod wrapper #o555))
-               #t)))))
+             (install-javadoc "target/javadoc/")))))
       (native-inputs libraries)
       (home-page "https://clojure.org/")
       (synopsis "Lisp dialect running on the JVM")