From: Christopher Baines <mail@cbaines.net>
To: Jesse Gibbons <jgibbons2357@gmail.com>
Cc: 38704-done@debbugs.gnu.org
Subject: bug#38704: [PATCH] gnu: clojure: Add wrapper.
Date: Fri, 20 Nov 2020 20:16:11 +0000 [thread overview]
Message-ID: <87v9dzkcms.fsf@cbaines.net> (raw)
In-Reply-To: <0c8be989d029bb4e8590f579e0b550f4f6905a2a.camel@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 3017 bytes --]
Jesse Gibbons <jgibbons2357@gmail.com> writes:
> gnu/packages/clojure.scm: (clojure)[inputs]: Add icedtea.
> [phases] {make-wrapper}: New phase.
>
> fixes: https://issues.guix.gnu.org/issue/32709
Hi Jesse,
Apologies for the long delay with this patch.
I tweaked the commit message, and the patch in one place and I've gone
ahead and pushed it to master as
d38903fab47fe333a99c68166e98e454d6e0e446.
> ---
> gnu/packages/clojure.scm | 20 +++++++++++++++++++-
> 1 file changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm
> index a9cabfe008..85d8708eee 100644
> --- a/gnu/packages/clojure.scm
> +++ b/gnu/packages/clojure.scm
> @@ -2,6 +2,7 @@
> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
> +;;; Copyright © 2019 Jesse Gibbons <jgibbons2357+guix@gmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -20,6 +21,7 @@
>
> (define-module (gnu packages clojure)
> #:use-module (gnu packages)
> + #:use-module (gnu packages java)
> #:use-module ((guix licenses) #:prefix license:)
> #:use-module (guix packages)
> #:use-module (guix download)
> @@ -77,6 +79,8 @@
> (sha256
> (base32
> "1kcyv2836acs27vi75hvf3r773ahv2nlh9b3j9xa9m9sdanz1h83")))))
> (build-system ant-build-system)
> + (inputs
> + `(("jre" ,icedtea)))
> (arguments
> `(#:imported-modules ((guix build clojure-utils)
> (guix build guile-build-system)
> @@ -113,7 +117,21 @@
> (add-after 'install-license-files 'install-doc
> (cut install-doc #:doc-dirs '("doc/clojure/") <...>))
> (add-after 'install-doc 'install-javadoc
> - (install-javadoc "target/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
> + "#!/bin/sh\n\n"
I used (which "sh") here rather than hardcoding /bin/sh, as then there's
no dependency on the changable /bin/sh.
> + (assoc-ref inputs "jre") "/bin/java -jar "
> + out "/share/java/clojure.jar \"$@\"\n"))))
> + (chmod wrapper #o555))
> + #t)))))
> (native-inputs libraries)
> (home-page "https://clojure.org/")
> (synopsis "Lisp dialect running on the JVM")
Thanks again,
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
prev parent reply other threads:[~2020-11-20 20:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-21 23:56 [bug#38704] [PATCH] gnu: clojure: Add wrapper Jesse Gibbons
2020-11-20 20:16 ` Christopher Baines [this message]
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=87v9dzkcms.fsf@cbaines.net \
--to=mail@cbaines.net \
--cc=38704-done@debbugs.gnu.org \
--cc=jgibbons2357@gmail.com \
/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).