From patchwork Sun Dec 10 13:03:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Pierre-Henry_Fr=C3=B6hring?= X-Patchwork-Id: 57473 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 4813E27BBEC; Sun, 10 Dec 2023 13:06:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 97B3527BBEA for ; Sun, 10 Dec 2023 13:06:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rCJVO-0001zD-EG; Sun, 10 Dec 2023 08:05:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rCJVF-0001r6-RW for guix-patches@gnu.org; Sun, 10 Dec 2023 08:05:52 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rCJVE-0005R1-Qg for guix-patches@gnu.org; Sun, 10 Dec 2023 08:05:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rCJVS-0005XO-V3 for guix-patches@gnu.org; Sun, 10 Dec 2023 08:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66801] [PATCH v5 02/15] gnu: elixir: Wrap binaries. Resent-From: Pierre-Henry =?utf-8?b?RnLDtmhyaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Dec 2023 13:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66801 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: liliana.prikler@gmail.com Cc: 66801@debbugs.gnu.org Received: via spool by 66801-submit@debbugs.gnu.org id=B66801.170221351221065 (code B ref 66801); Sun, 10 Dec 2023 13:06:02 +0000 Received: (at 66801) by debbugs.gnu.org; 10 Dec 2023 13:05:12 +0000 Received: from localhost ([127.0.0.1]:49697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCJUd-0005TS-9X for submit@debbugs.gnu.org; Sun, 10 Dec 2023 08:05:11 -0500 Received: from relay3-d.mail.gandi.net ([2001:4b98:dc4:8::223]:35019) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rCJUa-0005SV-4W for 66801@debbugs.gnu.org; Sun, 10 Dec 2023 08:05:09 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id 306B360006; Sun, 10 Dec 2023 13:04:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=phfrohring.com; s=gm1; t=1702213487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Too275ATH3DnZfaDLq2YMsLOUjiqHUrIkhEfxt+fPRM=; b=Rz7WnhkvX0+BDAL6hTKcu3wShZCU1HbbbHhyNuw+5lBtHuRMBjYkpNdiPS0RFiuTyyneqs +LFSsh22b5jGmEIr0L9xjGgbynNyIKaEYzRdPnhUaMQdcOQMwWWzDhfS4D0XLyiQu3pOtb 81Zq5QHnPJCFm7fpWaZznj7adJk0jgwr4TGIu/7BXl2tjtuWy9Qz75AVb56xHBYbkFh5NA 7I5L24HQLuKuVSrn2wLPgBZemr8CDOE6F1lhNIW9b5JCCXeaOWiins0q+QBi+2d486W2uh mXn8Y8PT1Iy2CJa4dcxNieo+wT9iyrKwyL1b4QL00sn4X2EcRBE4IEw+p7kv8w== From: Pierre-Henry =?utf-8?b?RnLDtmhyaW5n?= Date: Sun, 10 Dec 2023 14:03:55 +0100 Message-ID: <253e35eafde683ebfbe680253f80e73d869a8cdc.1702212039.git.contact@phfrohring.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <455871374089253cc10d2c5b17c2cceee4a5272d.1702212039.git.contact@phfrohring.com> References: <455871374089253cc10d2c5b17c2cceee4a5272d.1702212039.git.contact@phfrohring.com> MIME-Version: 1.0 X-GND-Sasl: contact@phfrohring.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/elixir.scm (elixir)[arguments]: Phase `wrap-programs' added. * gnu/packages/elixir.scm (elixir)[native-search-paths]: Variable `GUIX_ELIXIR_LIBS' added. Change-Id: I75bdde3aeedc1d495ea5fc2c5fc3fcdc5dc3fad2 --- gnu/packages/elixir.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 724b42512..15cbdbdfc 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -27,6 +27,7 @@ (define-module (gnu packages elixir) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (gnu packages) @@ -96,9 +97,20 @@ (define-public elixir (lambda* (#:key inputs #:allow-other-keys) ;; Some tests require access to a home directory. (setenv "HOME" "/tmp"))) - (delete 'configure)))) - (inputs - (list erlang git)) + (delete 'configure) + (add-after 'install 'wrap-programs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (programs '("elixir" "elixirc" "iex" "mix"))) + (for-each (lambda (program) + (wrap-program (string-append out "/bin/" program) + '("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}")))) + programs))))))) + (inputs (list erlang git)) + (native-search-paths + (list (search-path-specification + (variable "GUIX_ELIXIR_LIBS") + (files (list (string-append "lib/elixir/" (version-major+minor version))))))) (home-page "https://elixir-lang.org/") (synopsis "Elixir programming language") (description "Elixir is a dynamic, functional language used to build