unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Reily Siegel <mail@reilysiegel.com>
To: 48735@debbugs.gnu.org
Subject: [bug#48735] [PATCH v2 10/10] gnu: clojure: Remove wrapper in favor of using
Date: Thu, 23 Dec 2021 18:04:50 -0500	[thread overview]
Message-ID: <bea8af9949b1191ba5fca3e3c64931f36ea74c8b.1640300654.git.mail@reilysiegel.com> (raw)
In-Reply-To: <c7446d78cbf9dee04d4efba04dbcaa559a7f7013.1640300654.git.mail@reilysiegel.com>


* gnu/packages/clojure.scm (clojure): Remove generated wrapper around
clojure.jar, as it conflicts with the clojure-tools package.
---
 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 b091f31eca..71e5e22937 100644
--- a/gnu/packages/clojure.scm
+++ b/gnu/packages/clojure.scm
@@ -122,23 +122,7 @@ (define (extract-library name)
            (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")
-- 
2.34.0





  reply	other threads:[~2021-12-23 23:05 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-30  2:10 [bug#48735] [PATCH] gnu: Add clojure-tools Reily Siegel
2021-05-31  9:15 ` Maxime Devos
2021-09-03 16:11   ` Ludovic Courtès
     [not found]     ` <87r1e5636w.fsf@reilysiegel.com>
2021-09-06  7:56       ` bug#48735: " Ludovic Courtès
2021-12-23 23:04 ` [bug#48735] [PATCH v2 01/10] gnu: Add maven-resolver-transport-file Reily Siegel
2021-12-23 23:04   ` [bug#48735] [PATCH v2 02/10] gnu: Add maven-resolver-transport-http Reily Siegel
2021-12-23 23:04     ` [bug#48735] [PATCH v2 03/10] build: clojure-utils: Don't try to compile Clojure Reily Siegel
2021-12-23 23:04       ` [bug#48735] [PATCH v2 04/10] gnu: Add clojure-test-check Reily Siegel
2021-12-23 23:04         ` [bug#48735] [PATCH v2 05/10] gnu: Add clojure-tools-gitlibs Reily Siegel
2021-12-23 23:04           ` [bug#48735] [PATCH v2 06/10] gnu: Add clojure-data-codec Reily Siegel
2021-12-23 23:04             ` [bug#48735] [PATCH v2 07/10] gnu: Add clojure-data-xml Reily Siegel
2021-12-23 23:04               ` [bug#48735] [PATCH v2 08/10] gnu: Add clojure-tools-deps-alpha Reily Siegel
2021-12-23 23:04                 ` [bug#48735] [PATCH v2 09/10] gnu: Add clojure-tools Reily Siegel
2021-12-23 23:04                   ` Reily Siegel [this message]
2022-01-12  8:45 ` [bug#48735] [PATCH] " Ricardo Wurmus
2022-01-12 16:44   ` bug#48735: " Ricardo Wurmus
2022-01-12  9:23 ` [bug#48735] " Reily Siegel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bea8af9949b1191ba5fca3e3c64931f36ea74c8b.1640300654.git.mail@reilysiegel.com \
    --to=mail@reilysiegel.com \
    --cc=48735@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).