guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

10/10: gnu: clojure: Remove wrapper in favor of using clojure-tools.


From: guix-commits
Subject: 10/10: gnu: clojure: Remove wrapper in favor of using clojure-tools.
Date: Wed, 12 Jan 2022 11:44:24 -0500 (EST)

rekado pushed a commit to branch master
in repository guix.

commit 9fe48723c8266ffe8e6a639be2ec2e362cf20cb5
Author: Reily Siegel <mail@reilysiegel.com>
AuthorDate: Thu Dec 23 18:04:50 2021 -0500

    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>
---
 gnu/packages/clojure.scm | 18 +-----------------
 1 file changed, 1 insertion(+), 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")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]