From patchwork Tue Oct 8 04:14:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Suhail Singh X-Patchwork-Id: 31920 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 63CAB27BBEA; Tue, 8 Oct 2024 05:16:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 C2ABD27BBE2 for ; Tue, 8 Oct 2024 05:16:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sy1df-0006QY-4Z; Tue, 08 Oct 2024 00:15:59 -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 1sy1dc-0006QP-PS for guix-patches@gnu.org; Tue, 08 Oct 2024 00:15:57 -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 1sy1db-0008DP-Uk for guix-patches@gnu.org; Tue, 08 Oct 2024 00:15:56 -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=/S+s70+VsfFP7Wg6hI2DCzvoKSPwtBXxpUisA7Z6Q2s=; b=qPMery2EGejQuhwz2/EkvHd4e5XwLLbUc4jOCe3xkciMfR6P0+ssWklH7GbIO/7KzgrddV/bpFFuVi5ZxRoIIV/eRyTyv97afeexL/oaSBVbD8QhMb+fW9qRynXpljurnK4YCi1rgU2yg8uOXmwOQtoaHoQcR5TDxL97SxHPJB5GrAgjqxihliBHOlbyDP/XRojzTHqBYpYKh/oeLKhm/0bz05Y2FXmOZD+Cf6Ebtrd0mMZrYEeg7fzaLbgpHTT0EqniaZOrK13xrWCmyuQTp0j3KP7P8tqRfmW+IUKuQ+6CsDxjm/8CPx/CL9OAGOwp2pDI46RdqLVWroNtnBSjAg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sy1di-0002HE-IU; Tue, 08 Oct 2024 00:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72925] [PATCH v12 1/2] gnu: Add jpm package. 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:16: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.17283609308704 (code B ref 72925); Tue, 08 Oct 2024 04:16:02 +0000 Received: (at 72925) by debbugs.gnu.org; 8 Oct 2024 04:15:30 +0000 Received: from localhost ([127.0.0.1]:50111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sy1dB-0002GK-Q0 for submit@debbugs.gnu.org; Tue, 08 Oct 2024 00:15:30 -0400 Received: from mail-qv1-f66.google.com ([209.85.219.66]:56329) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sy1d9-0002GC-Oy for 72925@debbugs.gnu.org; Tue, 08 Oct 2024 00:15:28 -0400 Received: by mail-qv1-f66.google.com with SMTP id 6a1803df08f44-6cb2f272f8bso46478716d6.0 for <72925@debbugs.gnu.org>; Mon, 07 Oct 2024 21:15:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728360858; x=1728965658; 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=/S+s70+VsfFP7Wg6hI2DCzvoKSPwtBXxpUisA7Z6Q2s=; b=DA/y2H5JyRIPX8+fg9FIkgLUNBs+aFWk9Fl5yOYD8L1Wa9VExI2xcQSSGulO23IfTY e+t1ZuMc2ckwPeR5CoNEUJdRT1/Iuak8nCErxOjCgGXJbU/xbHZ3bSVqtGqNcFoPVgas xTf8yYku2rGBb2vX4xZKf7JoIDE1JHdbIewwsvT+atnGA9cVtw1AU+sy9/7rRCZSNO8w Cj5Ue0LRlLGmG6fj3Z+AkDIRJknO8EFkS6RXdCfiP0irv840dOqhH7SdYUMcJgjJtvZr qwqnLB0TL+1/jv2b3hSwaN9iGj8emqQ6FM9N0VujK8D9bybT6GolYTs5fSTsvbPJJQwq q8bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728360858; x=1728965658; 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=/S+s70+VsfFP7Wg6hI2DCzvoKSPwtBXxpUisA7Z6Q2s=; b=ivCj8LODzgTN1ofcGxnysP/eFuT+gbBiVwp0Y/ZbUj+YMyz8H+mgB3MWrnn6ukgG/S X8Ow6M0vkXKiJwq9PC9fkOb+/MLzMGi2zh4J/vCQ7UCgk0GaGHpksX4yjvugMeCGmT1m w3ppEkwTt8V2QTWEZtXxsxI0aBc6Feddfxgym1evk1256qs8YJvUsx1ma8GmVWaiO4rk O/UTvHRAsTzi+FC63R77yR1GosMFZFrqjVRaIkoNSQQbIKcR7mVgHX36qihWAGdBvGto IdtgrKjab/XwlHBH78a079ozNkTaG9ZtGNuj7rDcKG5gtUrTU0zyOlgidMuM+tPt0nNo wzgg== X-Gm-Message-State: AOJu0Yz4Ue/YehlOMYqtGzRESYjdYHlBD+3xLrwTj7hAGxERkkl439q5 2+Y1t/GoVhnDQmxnxg1cDLW5LL+HDtLjWZ49psz0hEw/PlKNf/dSb2V6/h0Z X-Google-Smtp-Source: AGHT+IFHjtWYoY2I1qMZuVwmVYYRgh1Kje0HdFQ/z/oWC35rmApcFyjgEkduGcXvzIHE2jYMkkzrqg== X-Received: by 2002:a05:6214:53c9:b0:6cb:3a1f:e47b with SMTP id 6a1803df08f44-6cb9a4ca073mr185076116d6.52.1728360858393; Mon, 07 Oct 2024 21:14:18 -0700 (PDT) Received: from gnus ([65.94.70.53]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6cba47528c9sm32110356d6.89.2024.10.07.21.14.17 for <72925@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 21:14:18 -0700 (PDT) From: Suhail Singh In-Reply-To: Message-ID: References: Date: Tue, 08 Oct 2024 00:14:06 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 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/lisp.scm (jpm): New variable. Change-Id: I9f5ab89a38622689b5d3545abe5d87906dc61f3b Signed-off-by: Suhail --- gnu/packages/lisp.scm | 65 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6c16d8ab71..04b56ea99b 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2024 Andreas Enge ;;; Copyright © 2024 bigbug ;;; Copyright © 2024 Ashish SHUKLA +;;; Copyright © 2024 Omar Bassam ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,7 @@ (define-module (gnu packages lisp) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix build-system trivial) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) @@ -917,6 +919,69 @@ (define-public janet assembler, PEG) is less than 1MB.") (license license:expat))) +(define-public jpm + (package + (name "jpm") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janet-lang/jpm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05rdxigmiy7vf93s16a8n2029lq33073jccz1rjl4iisxj6piw4l")))) + (build-system copy-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "configs/linux_config.janet" + (("/usr/local") + #$output) + (("\"cc\"") + (string-append "\"" + #$gcc "/bin/gcc" "\"")) + (("\"c\\+\\+\"") + (string-append "\"" + #$gcc "/bin/g++" "\"")) + (("\"git\"") + (string-append "\"" + #$git "/bin/git" "\"")) + (("\"curl\"") + (string-append "\"" + #$curl "/bin/curl" "\""))) + (substitute* "jpm/shutil.janet" + (("cp") + (string-append #$coreutils "/bin/cp"))) + (setenv "PREFIX" + #$output))) + (replace 'install + (lambda _ + (for-each (lambda (dir) + (mkdir-p (string-append #$output "/" dir))) + '("lib/janet/jpm" "share/man/man1")) + (invoke "janet" "bootstrap.janet" + "configs/linux_config.janet") + (wrap-program (string-append #$output "/bin/jpm") + `("JANET_HEADERPATH" ":" = + (,(string-append #$janet "/include/janet"))) + `("JANET_LIBPATH" ":" = + (,(string-append #$janet "/lib"))))))))) + (inputs (list bash-minimal)) + (propagated-inputs (list janet)) + (native-search-paths + (list $SSL_CERT_DIR $SSL_CERT_FILE)) + (home-page "https://janet-lang.org/") + (synopsis "Janet Project Manager for the Janet programming language") + (description + "@code{jpm} is the Janet Project Manager tool. It is a build +tool and its main uses are installing dependencies, compiling C/C++ to native +libraries, and other management tasks for Janet projects.") + (license license:expat))) + (define-public lisp-repl-core-dumper (package (name "lisp-repl-core-dumper") From patchwork Tue Oct 8 04:16:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Suhail Singh X-Patchwork-Id: 31921 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 285EA27BBEA; Tue, 8 Oct 2024 05:19:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 92E4427BBE2 for ; Tue, 8 Oct 2024 05:19:13 +0100 (BST) 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 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/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 © 2024 bigbug ;;; Copyright © 2024 Ashish SHUKLA ;;; Copyright © 2024 Omar Bassam +;;; Copyright © 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 "/" dir))) '("lib/janet/jpm" "share/man/man1")) (invoke "janet" "bootstrap.janet" "configs/linux_config.janet") - (wrap-program (string-append #$output "/bin/jpm") - `("JANET_HEADERPATH" ":" = - (,(string-append #$janet "/include/janet"))) - `("JANET_LIBPATH" ":" = - (,(string-append #$janet "/lib"))))))))) - (inputs (list bash-minimal)) + (let ((gcc-toolchain (assoc-ref inputs "gcc-toolchain"))) + (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 commencement)) + 'gcc-toolchain))) (propagated-inputs (list janet)) (native-search-paths (list $SSL_CERT_DIR $SSL_CERT_FILE))