From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id wMJVMcKyBGcp4gAAe85BDQ:P1 (envelope-from ) for ; Tue, 08 Oct 2024 04:19:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id wMJVMcKyBGcp4gAAe85BDQ (envelope-from ) for ; Tue, 08 Oct 2024 06:19:14 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=o9EMhwfw; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=cGy9nVIn; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1728361154; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=EEhjZWGCH83mFLY6MjMJqK1Omn8ZIAMAqcOFP+FzNvk=; b=O0uQb+UTUgZpRXX3vGhiseGiFnv3vcHEW+aBNzMy19vnJN63df1CLxOzYLfqMuQbkx8DSW wjptwaXyMLXrUtvrTRQ7/2oE/1/arERzkF2S5QTfVVAT1VvV2RDr2V9xSshVXyW9TShWMW TftwOS/0ttakmgrV+w/Aq0AevNC7fbNQ3iF4MizvR6QwQb17tUoinn341/zZKV18Pw97dr QYmuxVXHPRLbTZLTocz4xA/CB5TQdTPVDfS2WU1pDhTWQC1akFsoL3awXTxTpujh4Uo3iI 8coA6WNNZcM7MUCuCsauyPbsJWcuAcujM41St5HWrN/vu3Tn7ONN+d1V5JN6Pw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1728361154; a=rsa-sha256; cv=none; b=PVTecVPq3prm0JffX0nUSUl/Y7nqw0pEdJmhJaUvPcsfTWknmeIGnMjxMGNxysnIzmCnAe WU3RrnMeL1qGvxis+6o7e24yVHjPDIZb19D9vYTdf4BxlSLTM1I4wcxYJk4b6A4ygk9YUx xqsJdWUxtLxzM3wqkgIO7BCtkVzhjfmVB83Fxv9E4WUhxkFURHuOmbcaOHcFa34i0SJvWC PXNaA436GLGVwLQXjO5qxZvqxArvxoEJyjYUyOuPhAtbOSEwG2ODnvDwui/wjjLx3rutix UJ9kNWP/B8XFK53x2s93RXpqOy1zj+H+tSsvZ6g3DlRuUX3yaaexaHJ3+WYnnw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=o9EMhwfw; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=cGy9nVIn; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4DE90788BA for ; Tue, 08 Oct 2024 06:19:14 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sy1gb-0006aI-AN; Tue, 08 Oct 2024 00:19:01 -0400 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 1sy1ga-0006Zw-7J for guix-patches@gnu.org; Tue, 08 Oct 2024 00:19:00 -0400 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 1sy1gZ-0008Mf-Us for guix-patches@gnu.org; Tue, 08 Oct 2024 00:18:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=EEhjZWGCH83mFLY6MjMJqK1Omn8ZIAMAqcOFP+FzNvk=; b=o9EMhwfw02Eb6QRnGv8gDRGLckFtHqbuX/5hrVfV7K19KbQvAM5jXOYIcyyBWuLSJ1eNAdhJIFIPwx1Nrf/lMoO9/SnFoIa6F5iwPR9Jvm3LRciWlcp+qaZV5yDstcjDg3iwxh1MAtQIFlapzamqGlr6ok0az6fIYc0NnR5XkZiveCMRKvEIDoRKS5DwjxMtiR3gUWcKg9NkiMk+DeSJuTmsy5sLOvTSzt5Vn9v46wPRSHGr+Ny/Gx16QrPPzl0jGVcr3+iuk1usjXzPQKfsQaxYFQsBFSa/iVNQtKI5obh7pVkzdRYDL2RguvmfaFMSM47G9Xv3Ic1D+YB6t+Q/QQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sy1gc-0002NA-AR; Tue, 08 Oct 2024 00:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72925] [PATCH v12 2/2] gnu: Improve user-experience for jpm. Resent-From: Suhail Singh Original-Sender: "Debbugs-submit" Resent-CC: glv@posteo.net, cox.katherine.e+guix@gmail.com, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Tue, 08 Oct 2024 04:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72925 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 72925@debbugs.gnu.org Cc: Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-Xcc: Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by 72925-submit@debbugs.gnu.org id=B72925.17283610989034 (code B ref 72925); Tue, 08 Oct 2024 04:19:02 +0000 Received: (at 72925) by debbugs.gnu.org; 8 Oct 2024 04:18:18 +0000 Received: from localhost ([127.0.0.1]:50119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sy1ft-0002Ld-Ib for submit@debbugs.gnu.org; Tue, 08 Oct 2024 00:18:18 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:50478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sy1fr-0002LU-F5 for 72925@debbugs.gnu.org; Tue, 08 Oct 2024 00:18:16 -0400 Received: by mail-qk1-f193.google.com with SMTP id af79cd13be357-7ae6f8956baso481717185a.1 for <72925@debbugs.gnu.org>; Mon, 07 Oct 2024 21:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728361026; x=1728965826; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:date:references :message-id:in-reply-to:subject:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EEhjZWGCH83mFLY6MjMJqK1Omn8ZIAMAqcOFP+FzNvk=; b=cGy9nVInWQn+GpathmeUsb+wL6wbXbbobFdGYckKefrNp1Qr4BWx/pCh2Qv6/+YmQ5 CYQZreBm0pQtqHWDF5/GipY39S+Y0Z3PmuXKFr+IiQvhWsI/t/abMngmCBu6vJ8U4QlW ChAsBAosgcYm7tm2orB8frsOdtLCX7W4JY+M1uhhVptMwp/TAko9rcyLwY5Z2AYEtqz7 hgo+MX3q24sr3TlwdAh8hWBoSjL45Zn5oqGGd+j13VF7s4I5rHUHHddULhy8EraNH0VO 9OTmFCcjgK2mrJVWc+Z1wNcF5HQsm9BNpYvJklFh6TM0vgwOX3OZpx6wYe424IBEKrpU I5rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728361026; x=1728965826; h=content-transfer-encoding:mime-version:user-agent:date:references :message-id:in-reply-to:subject:to:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=EEhjZWGCH83mFLY6MjMJqK1Omn8ZIAMAqcOFP+FzNvk=; b=rRjF2XHF+rtTz+C49hul36BPx7JKeSDv6+B5nB9kHRy71KYOP+i+HsCQV1CKuikFwG UScy/fMpSIBygCYiYlrGNtbKb+LXx/dPvpor7lG24bfZRofj+v6q3yOr8VF3Wqq3/ii7 0zZhAVyJef1LZG9LqIZjRgnhP5PJBjyoAvu8o+fcdEawXauLt/mSCQ3ldvn7Lk2K4uo9 yj5aya1PBCkgiTGUSfnWgjAuntdXJ8zpaxey7cFzmiMdAdCjn81lMqplxIZcATy1O/yE ReZ8FlY+ZhcUY0R8UCw5p2XWLJEiCmyUuIj9be/PVLO8GyaL3Drb/4Cy3vj2jaOQg1n/ 89eQ== X-Gm-Message-State: AOJu0YxyJazTmott9/lJ+QsHlBoaTgN33bcZBf+dGCOYFjV3tl5z8YE3 FVjfHULrre3zqALYk9S6zOsK+0WUOUK8AND96ShHP1baPv5CI3u+yJNKkLbw X-Google-Smtp-Source: AGHT+IHr8qMaKGn3mW3rus9cwtQZXO+FGDdMKA3+zOl3DDs1Fb7wjXE9uyw3OaV1PMTK/oWwiuZpXw== X-Received: by 2002:a05:620a:3195:b0:79f:67b:4fdc with SMTP id af79cd13be357-7ae6f42cefemr2663917985a.2.1728361026383; Mon, 07 Oct 2024 21:17:06 -0700 (PDT) Received: from gnus ([65.94.70.53]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45da74b1eafsm32735311cf.5.2024.10.07.21.17.04 for <72925@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 21:17:05 -0700 (PDT) From: Suhail Singh In-Reply-To: Message-ID: <4665e2a478a63cf0bc6b8a18a2fb44687298bbd7.1728359428.git.suhail@bayesians.ca> References: Date: Tue, 08 Oct 2024 00:16:54 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 1.22 X-Spam-Score: 1.22 X-Migadu-Queue-Id: 4DE90788BA X-Migadu-Scanner: mx13.migadu.com X-TUID: OAmgwoBEyqnD * gnu/packages/lisp.scm (jpm): Ensure jpm respects JANET_HEADERPATH and JANET_LIBPATH if set by user. Ensure gcc/g++ is able to find header files = and compilation-related utilities. Change-Id: Ic7218dbd10e6fabddded50894b82492de8cabc88 --- gnu/packages/lisp.scm | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 04b56ea99b..4223540913 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -30,6 +30,7 @@ ;;; Copyright =C2=A9 2024 bigbug ;;; Copyright =C2=A9 2024 Ashish SHUKLA ;;; Copyright =C2=A9 2024 Omar Bassam +;;; Copyright =C2=A9 2024 Suhail Singh ;;; ;;; This file is part of GNU Guix. ;;; @@ -959,18 +960,34 @@ (define-public jpm (setenv "PREFIX" #$output))) (replace 'install - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (dir) (mkdir-p (string-append #$output "/" di= r))) '("lib/janet/jpm" "share/man/man1")) (invoke "janet" "bootstrap.janet" "configs/linux_config.janet") - (wrap-program (string-append #$output "/bin/jpm") - `("JANET_HEADERPATH" ":" =3D - (,(string-append #$janet "/include/janet"))) - `("JANET_LIBPATH" ":" =3D - (,(string-append #$janet "/lib"))))))))) - (inputs (list bash-minimal)) + (let ((gcc-toolchain (assoc-ref inputs "gcc-toolcha= in"))) + (wrap-program (string-append #$output "/bin/jpm") + `("JANET_HEADERPATH" ":" prefix + (,(string-append #$janet "/include/janet"))) + `("JANET_LIBPATH" ":" prefix + (,(string-append #$janet "/lib"))) + `("C_INCLUDE_PATH" ":" prefix + (,(string-append gcc-toolchain "/include"))) + `("CPLUS_INCLUDE_PATH" ":" prefix + (,(string-append gcc-toolchain "/include/c++") + ,(string-append gcc-toolchain "/include"))) + `("LIBRARY_PATH" ":" prefix + (,(string-append gcc-toolchain "/lib") + ,(string-append gcc-toolchain "/lib64"))) + `("PATH" ":" prefix + (,(string-append gcc-toolchain "/bin") + ,(string-append #$coreutils "/bin")))))))))) + (inputs (list bash-minimal + ;; Lazily resolve the gcc-toolchain to avoid a circular + ;; dependency. + (module-ref (resolve-interface '(gnu packages commenceme= nt)) + 'gcc-toolchain))) (propagated-inputs (list janet)) (native-search-paths (list $SSL_CERT_DIR $SSL_CERT_FILE)) --=20 2.46.1