From unknown Fri Jun 13 11:26:11 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#38704] [PATCH] gnu: clojure: Add wrapper. Resent-From: Jesse Gibbons Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Dec 2019 23:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38704@debbugs.gnu.org X-Debbugs-Original-To: guix-patches mailing list Received: via spool by submit@debbugs.gnu.org id=B.157697261529854 (code B ref -1); Sat, 21 Dec 2019 23:57:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Dec 2019 23:56:55 +0000 Received: from localhost ([127.0.0.1]:48943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iiocA-0007lS-QR for submit@debbugs.gnu.org; Sat, 21 Dec 2019 18:56:55 -0500 Received: from lists.gnu.org ([209.51.188.17]:52721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iioc9-0007lL-DO for submit@debbugs.gnu.org; Sat, 21 Dec 2019 18:56:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58270) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iioc8-0003Ff-0g for guix-patches@gnu.org; Sat, 21 Dec 2019 18:56:53 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=BAYES_50, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iioc6-0005vs-Dc for guix-patches@gnu.org; Sat, 21 Dec 2019 18:56:51 -0500 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:39193) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iioc5-0005cQ-MN for guix-patches@gnu.org; Sat, 21 Dec 2019 18:56:49 -0500 Received: by mail-pj1-x102d.google.com with SMTP id t101so5795883pjb.4 for ; Sat, 21 Dec 2019 15:56:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:subject:to:date:mime-version:user-agent :content-transfer-encoding; bh=6fVDAQji2vEk9H+xnX5CiFEpXJAk7GdqvcPOqGqZGCI=; b=ZOt8uaoxXd9OcShZmPKRmb50y2phVsLSAfoP5bl6yaWw/ClbfHjfPaR+BCb4gaOTfk zAMm3YEXqgVg7Q4/pPHsV2O/jIdz5v4J232FCZ2KdOiWgve/aam35mC8ZW2tcGbu6FJG newMT2hjfTQkzewCC7y7a3v+PwPCOlzvAead+XEzlSvbFhhRfbhI8CkbEBydAU33y5z6 pPT5FVkT5FuLy1APWPMzZtWxSW6CfsoyH0neyi8+QfdYolgsZtQGXV2/ygeWiaQGtX+A 2hc6zm3CBiaNy0JFjKJHKlWFfqIYKMlR7nd2ujsyBAjv9FzRMPqqwWzd/gFAC2VMWrWQ GVvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:subject:to:date:mime-version :user-agent:content-transfer-encoding; bh=6fVDAQji2vEk9H+xnX5CiFEpXJAk7GdqvcPOqGqZGCI=; b=shRoNOKvxeI9OxK9zy5QIdHLfBT+c+2NGfbC82+s1GSDIOONpxQXRg9mULsVTCSGf7 R/RGoTjMa8G3394LAQrss8tlOe9N7bQ2BoU+5gCAJCC+R9lpGCdbA30wseaQEOMl+66R aQw855UlhO30nRXKrNlaj2OLYEuxJYOm32mS2JZj1lWli7Meh/8HX8SH7DGbMqakoV4B nlGxfKmLT31TrTy8XYX5EAqdbHBhf+PmZrPRbHlkOScyoSMOm1gxHnv1MmZG6zB5hWFu RBM3w8INJCyVtYL3SmNlQuh0+X5t8kvT29RkLGVpxLpDAg3kCxKo9dJQ/iHaoKoPsqH2 8pgg== X-Gm-Message-State: APjAAAXctn36xQoibggaUBgu3mtvPcmH2X+UnuJEQd+E/nK4LhIwOz5i ci2OV7r518mQ6Scwqmud463kaQ2p X-Google-Smtp-Source: APXvYqxAid4fnBUQUVYTkNkHFJm4MYdc0CNS95lPy0K5vr10ItPJRlsnFqoXjnwONd9nMHvM75vYLA== X-Received: by 2002:a17:902:8344:: with SMTP id z4mr24211540pln.41.1576972605445; Sat, 21 Dec 2019 15:56:45 -0800 (PST) Received: from piranhaplant.local ([199.68.53.171]) by smtp.googlemail.com with ESMTPSA id m71sm17683320pje.0.2019.12.21.15.56.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Dec 2019 15:56:44 -0800 (PST) From: Jesse Gibbons X-Google-Original-From: Jesse Gibbons Message-ID: <0c8be989d029bb4e8590f579e0b550f4f6905a2a.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Date: Sat, 21 Dec 2019 16:56:43 -0700 MIME-Version: 1.0 User-Agent: Evolution 3.32.4 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::102d X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) gnu/packages/clojure.scm: (clojure)[inputs]: Add icedtea. [phases] {make-wrapper}: New phase. fixes: https://issues.guix.gnu.org/issue/32709 --- 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 ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019 Jesse Gibbons ;;; ;;; 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" + (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") From unknown Fri Jun 13 11:26:11 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Jesse Gibbons Subject: bug#38704: closed (Re: [bug#38704] [PATCH] gnu: clojure: Add wrapper.) Message-ID: References: <87v9dzkcms.fsf@cbaines.net> <0c8be989d029bb4e8590f579e0b550f4f6905a2a.camel@gmail.com> X-Gnu-PR-Message: they-closed 38704 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 38704@debbugs.gnu.org Date: Fri, 20 Nov 2020 20:17:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1605903422-20425-1" This is a multi-part message in MIME format... ------------=_1605903422-20425-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #38704: [PATCH] gnu: clojure: Add wrapper. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 38704@debbugs.gnu.org. --=20 38704: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D38704 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1605903422-20425-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 38704-done) by debbugs.gnu.org; 20 Nov 2020 20:16:21 +0000 Received: from localhost ([127.0.0.1]:44357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kgCpR-0005IL-1F for submit@debbugs.gnu.org; Fri, 20 Nov 2020 15:16:21 -0500 Received: from mira.cbaines.net ([212.71.252.8]:37742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kgCpP-0005ID-6l for 38704-done@debbugs.gnu.org; Fri, 20 Nov 2020 15:16:19 -0500 Received: from localhost (188.30.135.14.threembb.co.uk [188.30.135.14]) by mira.cbaines.net (Postfix) with ESMTPSA id 2D5D927BBF5; Fri, 20 Nov 2020 20:16:18 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 5a590c76; Fri, 20 Nov 2020 20:16:15 +0000 (UTC) References: <0c8be989d029bb4e8590f579e0b550f4f6905a2a.camel@gmail.com> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines To: Jesse Gibbons Subject: Re: [bug#38704] [PATCH] gnu: clojure: Add wrapper. In-reply-to: <0c8be989d029bb4e8590f579e0b550f4f6905a2a.camel@gmail.com> Date: Fri, 20 Nov 2020 20:16:11 +0000 Message-ID: <87v9dzkcms.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Jesse Gibbons writes: > gnu/packages/clojure.scm: (clojure)[inputs]: Add icedtea. > [phases] {make-wrapper}: New phase. > > fixes: https://issues.guix.gnu.org/issue/32709 Hi Jesse, Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 38704-done Cc: 38704-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Jesse Gibbons 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 =C2=A9 2018 Alex Vong > ;;; Copyright =C2=A9 2018 Pierre Neidhardt > ;;; Copyright =C2=A9 2019 Tobias Geerinckx-Rice > +;;; Copyright =C2=A9 2019 Jesse Gibbons > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -20,6 +21,7 @@ >=20=20 > (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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl+4JAtfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xf8Bg//SCMVPoDALDbo/45DZLkie8IN1wkIr0zN AFOMithJ1AnEu8dY1fEGIv47y8cYRb6ftpyPLBwrA2XhLw2z9yIC7iI+R81TgroS V0FOEskZrK/3loy7mbjCIvJEMBBYGoKxCrrdmqVgi9sSIKyqgXWOq4SAex9qY4SE 8CKM5VnmPNPqSLqG8llKlb/NBHuQFsjv8QZUS5WMfGsakMetKTtXOVmnpZdtUpP5 ZCriEODMr95Nzhe1PLJI0KkCyCpjIM0m2uE+on9dY1Uzx6hJY/JAmXS03KGKlS2z 7IQgHizFF5qzIIrDx1XVpp3ZJZx15LiTb9IxMTnn800qJuNmI2LmRyE5/Qls1R+U fBpkmLsUXL+4RkH8kSKTzH7w+YRCmobsLeIewjGcdsyME8ThUUegcEwyQ9irsbbf oDEpUebpMALigtr/WpcIYvBR80ruVESb6/oGVaVgef5tmeDshiFTl7C2lEUYAL/f eQcebIMFgq96IJg8I9Vzil64Jcnzylwg/2bMMzWn13RNzjDDZVq5DDiNJaW6E5p4 MGkX6OQ29M7p01WbMGujDVGRK8z6VNBEOeSVPRAuBXWcy7IC82Vd7ATB5YGJ7b2h XGDq8ZNdt2tPjxhhbEh80zpxc6EKAyrLWuWWzUzq6iWb/s6L81X9AqL+viFtu//C ey3sw8WhjI8= =oRhN -----END PGP SIGNATURE----- --=-=-=-- ------------=_1605903422-20425-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 Dec 2019 23:56:55 +0000 Received: from localhost ([127.0.0.1]:48943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iiocA-0007lS-QR for submit@debbugs.gnu.org; Sat, 21 Dec 2019 18:56:55 -0500 Received: from lists.gnu.org ([209.51.188.17]:52721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iioc9-0007lL-DO for submit@debbugs.gnu.org; Sat, 21 Dec 2019 18:56:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58270) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iioc8-0003Ff-0g for guix-patches@gnu.org; Sat, 21 Dec 2019 18:56:53 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=BAYES_50, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iioc6-0005vs-Dc for guix-patches@gnu.org; Sat, 21 Dec 2019 18:56:51 -0500 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:39193) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iioc5-0005cQ-MN for guix-patches@gnu.org; Sat, 21 Dec 2019 18:56:49 -0500 Received: by mail-pj1-x102d.google.com with SMTP id t101so5795883pjb.4 for ; Sat, 21 Dec 2019 15:56:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:subject:to:date:mime-version:user-agent :content-transfer-encoding; bh=6fVDAQji2vEk9H+xnX5CiFEpXJAk7GdqvcPOqGqZGCI=; b=ZOt8uaoxXd9OcShZmPKRmb50y2phVsLSAfoP5bl6yaWw/ClbfHjfPaR+BCb4gaOTfk zAMm3YEXqgVg7Q4/pPHsV2O/jIdz5v4J232FCZ2KdOiWgve/aam35mC8ZW2tcGbu6FJG newMT2hjfTQkzewCC7y7a3v+PwPCOlzvAead+XEzlSvbFhhRfbhI8CkbEBydAU33y5z6 pPT5FVkT5FuLy1APWPMzZtWxSW6CfsoyH0neyi8+QfdYolgsZtQGXV2/ygeWiaQGtX+A 2hc6zm3CBiaNy0JFjKJHKlWFfqIYKMlR7nd2ujsyBAjv9FzRMPqqwWzd/gFAC2VMWrWQ GVvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:subject:to:date:mime-version :user-agent:content-transfer-encoding; bh=6fVDAQji2vEk9H+xnX5CiFEpXJAk7GdqvcPOqGqZGCI=; b=shRoNOKvxeI9OxK9zy5QIdHLfBT+c+2NGfbC82+s1GSDIOONpxQXRg9mULsVTCSGf7 R/RGoTjMa8G3394LAQrss8tlOe9N7bQ2BoU+5gCAJCC+R9lpGCdbA30wseaQEOMl+66R aQw855UlhO30nRXKrNlaj2OLYEuxJYOm32mS2JZj1lWli7Meh/8HX8SH7DGbMqakoV4B nlGxfKmLT31TrTy8XYX5EAqdbHBhf+PmZrPRbHlkOScyoSMOm1gxHnv1MmZG6zB5hWFu RBM3w8INJCyVtYL3SmNlQuh0+X5t8kvT29RkLGVpxLpDAg3kCxKo9dJQ/iHaoKoPsqH2 8pgg== X-Gm-Message-State: APjAAAXctn36xQoibggaUBgu3mtvPcmH2X+UnuJEQd+E/nK4LhIwOz5i ci2OV7r518mQ6Scwqmud463kaQ2p X-Google-Smtp-Source: APXvYqxAid4fnBUQUVYTkNkHFJm4MYdc0CNS95lPy0K5vr10ItPJRlsnFqoXjnwONd9nMHvM75vYLA== X-Received: by 2002:a17:902:8344:: with SMTP id z4mr24211540pln.41.1576972605445; Sat, 21 Dec 2019 15:56:45 -0800 (PST) Received: from piranhaplant.local ([199.68.53.171]) by smtp.googlemail.com with ESMTPSA id m71sm17683320pje.0.2019.12.21.15.56.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Dec 2019 15:56:44 -0800 (PST) From: Jesse Gibbons X-Google-Original-From: Jesse Gibbons Message-ID: <0c8be989d029bb4e8590f579e0b550f4f6905a2a.camel@gmail.com> Subject: [PATCH] gnu: clojure: Add wrapper. To: guix-patches mailing list Content-Type: text/plain; charset="UTF-8" Date: Sat, 21 Dec 2019 16:56:43 -0700 MIME-Version: 1.0 User-Agent: Evolution 3.32.4 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::102d X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) gnu/packages/clojure.scm: (clojure)[inputs]: Add icedtea. [phases] {make-wrapper}: New phase. fixes: https://issues.guix.gnu.org/issue/32709 --- 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 ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019 Jesse Gibbons ;;; ;;; 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" + (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") ------------=_1605903422-20425-1--