From patchwork Sat Dec 21 23:56:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jesse Gibbons X-Patchwork-Id: 19422 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 57E621796F; Sat, 21 Dec 2019 23:57:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E28DB1796A for ; Sat, 21 Dec 2019 23:57:14 +0000 (GMT) Received: from localhost ([::1]:43090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiocU-0003Fp-B8 for patchwork@mira.cbaines.net; Sat, 21 Dec 2019 18:57:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59851) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiocP-0003Fj-0x for guix-patches@gnu.org; Sat, 21 Dec 2019 18:57:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iiocI-0006es-Df for guix-patches@gnu.org; Sat, 21 Dec 2019 18:57:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42970) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iiocI-0006dr-9H for guix-patches@gnu.org; Sat, 21 Dec 2019 18:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iiocI-0007lp-6Q for guix-patches@gnu.org; Sat, 21 Dec 2019 18:57:02 -0500 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 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> Date: Sat, 21 Dec 2019 16:56:43 -0700 MIME-Version: 1.0 User-Agent: Evolution 3.32.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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(-) (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") 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)