From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id IAzUHXQye2ckIQAAe85BDQ:P1 (envelope-from ) for ; Mon, 06 Jan 2025 01:31:32 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id IAzUHXQye2ckIQAAe85BDQ (envelope-from ) for ; Mon, 06 Jan 2025 02:31:32 +0100 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=f9eb3xFz; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Fazo4q0p; 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=1736127092; 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=0ZlKn2Hgndbawu/M/HUtuyHym9j/CljB0id0CwkGC7g=; b=aFPqFiVYLGAmq6vxkvSGFblod4SXWKQxJNjZdDJEhK5XCQryspGTv8tpINx+M87UrA/89g 80yX8B+NTwSWgUrE7ymKLCyLEKi/3vP8avVCBFhawIlgf4BU7Lp/UDfeR3aZVQfxeT0pf2 BszcEph7rqsyQzbpcLHaT9RHrzW4cporunHRCDqMf4R3Cu/WsQ9k5B2nudWXmBOUrUH2Qp YH6cvqmo/c+WVDKed6ulTP7eBPtpw+0xGcUeVXs9qsgRKJOoHvqkM80/BpTA9iioKuqTBh 8kn59BIEPluQKxGK7erGLksSoRwOvDyb9fxl1zG3rap903ASVrm7RL3hTkBpqA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=f9eb3xFz; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Fazo4q0p; 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-Seal: i=1; s=key1; d=yhetil.org; t=1736127092; a=rsa-sha256; cv=none; b=TFklLiD8xvy6hoR0ol6F8Uno07XTNW5pos5eJmHch0oWPA+QZ47ov2LtqHMKbP1Fw3Ieoq 6z1XWUIYTKD+ade7FhEezag9B9UwOGsa0JPY7beHZBgDfrhFntT2ksCDR9+5cH7c8Rhyu/ 2P5zpQIdtNrXcX/fZ0YkWkRjcvh4LgaVrD1em/7onvRU37xalrX++SaALknUwvYV1+iOgn xYY9DG7bHjmkZ/wMNVxyue/3f/H7c0HRytqqufqADqJ15uYQBq4pLZYMynxuV3wx6vKrwZ 487sFHUfdQLmHtzkEL/KrtRty5mjZnQr3/3U5x9p8sBGKW0LmGlcI2oEhVwsGQ== 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 0D7309DEDF for ; Mon, 06 Jan 2025 02:31:32 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUbxU-0000OF-8q; Sun, 05 Jan 2025 20:31:08 -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 1tUbxP-0000Nn-VC for guix-patches@gnu.org; Sun, 05 Jan 2025 20:31:04 -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 1tUbxO-0001rI-Il for guix-patches@gnu.org; Sun, 05 Jan 2025 20:31:03 -0500 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:In-Reply-To:From:To:References:Subject; bh=0ZlKn2Hgndbawu/M/HUtuyHym9j/CljB0id0CwkGC7g=; b=f9eb3xFz2p2ffQZ0te9j+D6LovxcMqbp0+owWV5Ib0F/8PmcBVQVcsCBOUqA6A62xgvkqycf33NQi+AIsNjDc7v65/kGRhc2BL9iwz8NVLztOIFJbFCTNy1iX1p4lWDiu2bvbevo2uu/ukW2L0FlKdrj+Vd6SSuMXKqP5PBBVIadMdfXPUYnXS5uJB2iozBnxg60+B1MLswcW3Aey5A7rD+IIAMgBj+tQ/ugpX9+ifI/nCKBi03XTNzJmJNiuoKXOTUMKqd3gptP0aDbae0i5k6XYX2Z/+zefLMyveyRL+SacS7W8KwQxq7NxzXi0uzgzXHb+6NfOsDO2r94OnDHHg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUbxO-00016P-CU; Sun, 05 Jan 2025 20:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75394] [PATCH v14 2/2] gnu: Improve user-experience for jpm. References: 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: Mon, 06 Jan 2025 01:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75394@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 75394-submit@debbugs.gnu.org id=B75394.17361270504211 (code B ref 75394); Mon, 06 Jan 2025 01:31:02 +0000 Received: (at 75394) by debbugs.gnu.org; 6 Jan 2025 01:30:50 +0000 Received: from localhost ([127.0.0.1]:36054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUbxB-00015p-KH for submit@debbugs.gnu.org; Sun, 05 Jan 2025 20:30:50 -0500 Received: from mail-qk1-x741.google.com ([2607:f8b0:4864:20::741]:55772) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tUbx8-00015Z-LT for 75394@debbugs.gnu.org; Sun, 05 Jan 2025 20:30:47 -0500 Received: by mail-qk1-x741.google.com with SMTP id af79cd13be357-7b85d5cc39eso1503090885a.3 for <75394@debbugs.gnu.org>; Sun, 05 Jan 2025 17:30:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736127040; x=1736731840; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=0ZlKn2Hgndbawu/M/HUtuyHym9j/CljB0id0CwkGC7g=; b=Fazo4q0pbKRQEtiBvtT9ooBPcd4EmjqmISJhuSIqVha5w2BGrPNqnKVtILFEUwjDiI jkwsleeSPrPymklIGLtUjMkMPdwZG8B0+xbXMYhyO08ehY1Cjp1dcXW0YA7E/bed5PA7 NHeWOm0WQLb1KYwrRTkzayXiuzS9FTzznE04QWf4mFBgNLOtZEFfBNLeJybxzeYW+C5X 2wFB49ITokGpvekK4rGBPJdYgElJq1rhp1k6BogVV+dwTYN/P1v3j53KJri/JyZiJ5QM ydeV9ZDcBaYwZgpFROBHZQxKdED3fYquiGGvczCk1IytO/VH65Xi8Sez2WcPTkMjRxQS VRpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736127040; x=1736731840; h=content-transfer-encoding:mime-version:message-id:date:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0ZlKn2Hgndbawu/M/HUtuyHym9j/CljB0id0CwkGC7g=; b=w/fAdyV1Be66WW4WzQb8KeqZIlQ2MobLhLkDUSbzCrCPdYI26xcmgExNhHqH0mvrnE 0siQgLvJVZXRB8PZachdU1rcyGQQeCqls88SueZfBq2RtcW9O/IsO7qPUuW1+tJuW9mY En3nTfBWsKLK47cai0HDuShRhbgZJEN+va09AWrsvYs2WI/oVniky7RgD923scQJL9MY T1vzKh1e3A81HS7eAPht36N8fLOOOaOrIJkf33eVrLZk1g7i/IRD2s7hR6Nozv1n14YS yGV01lqAqBib5R1vhzzY4ckBLzYvz2Yj3jSeBsXftAB1HAIOcEw70n6zx0mu1DWHkiXg XLRA== X-Gm-Message-State: AOJu0Yzca9vcuqipUHdfYoR00tmdU26xbjOfGBgedcD5R4/EtVYydtfU z0O94EV1tR7GY9IZ733VKSyJB3aJ90xUk0gUfShIgqFif6KVoQMlLsFyvEnt X-Gm-Gg: ASbGncuzAOvakYuSk5oWw/+15eetZrzqvFqvjWn4Wl9Z3RdPqSaJoFaaGGmIYHuwM3C AFqzbfUzA21GGQ4WOsdgkhGC8DXVlcEY4FmjL6LRCuBmvo03SeCylVrtvrPh45Q6y/ELVkhAbPH cxW6+NIQ7b6Ha1j1qwsDBWONTsWopc9I7DasOqwpnpdi1FNRswbu0H6m8I+mL37XFXxi9oCUKne 9WfkTxPg4PTU/t3pgka3LQhINudLWmDcf0tv5E1oDk1KruGHKw4vwUOUkBBfqnAn0v5+VGlAd6x z2t7qIPideV595AK+Q== X-Google-Smtp-Source: AGHT+IHUoljsRIir3r/sOQTRr1mYtpN9BLV/uSMRa8R2mhdExQflqTAyY66AfLdUqFKuqBNEW0Y0kw== X-Received: by 2002:a05:620a:2a14:b0:7b6:f219:9dd9 with SMTP id af79cd13be357-7b9ba852abbmr10690446285a.55.1736127040440; Sun, 05 Jan 2025 17:30:40 -0800 (PST) Received: from gnus (mtrlpq0776w-70-26-179-129.dsl.bell.ca. [70.26.179.129]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b9ac4ee8b0sm1463385385a.124.2025.01.05.17.30.39 for <75394@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jan 2025 17:30:40 -0800 (PST) From: "Suhail Singh" In-Reply-To: Date: Mon, 7 Oct 2024 23:22:13 -0400 Message-Id: <68d09c78846a198ba4499f89f53e4b3782208c9d.1736126524.git.suhail@bayesians.ca> 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -0.45 X-Spam-Score: -0.45 X-Migadu-Queue-Id: 0D7309DEDF X-Migadu-Scanner: mx10.migadu.com X-TUID: jK9LFt5Hy843 * 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 | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f99ad68828..eb3063d3d9 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 ;;; Copyright =C2=A9 2024 David Pflug ;;; Copyright =C2=A9 2024 Janneke Nieuwenhuizen ;;; @@ -965,22 +966,39 @@ (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"))))))))) + (let ((gcc-toolchain (assoc-ref inputs "gcc-toolcha= in")) + (core-min (assoc-ref inputs "coreutils-minima= l"))) + (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 core-min "/bin")))))))))) (inputs (list bash-minimal coreutils-minimal curl gcc - git-minimal/pinned)) + git-minimal/pinned + ;; 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))