From: Suhail Singh <suhailsingh247@gmail.com>
To: 72925@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>,
"Omar Bassam" <omar.bassam88@gmail.com>,
"Guillaume Le Vaillant" <glv@posteo.net>,
"Katherine Cox-Buday" <cox.katherine.e+guix@gmail.com>,
"Munyoki Kilyungi" <me@bonfacemunyoki.com>,
"Sharlatan Hellseher" <sharlatanus@gmail.com>,
jgart <jgart@dismail.de>
Subject: [bug#72925] [PATCH v13 2/2] gnu: Improve user-experience for jpm.
Date: Mon, 14 Oct 2024 13:26:34 -0400 [thread overview]
Message-ID: <3cbf3de67871ab5aa7771d146e4dcdcef1a3e880.1728925129.git.suhail@bayesians.ca> (raw)
In-Reply-To: <cover.1728925129.git.suhail@bayesians.ca>
* 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 7b557fc493..1cc8390f6b 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -30,6 +30,7 @@
;;; Copyright © 2024 bigbug <bigbookofbug@proton.me>
;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
;;; Copyright © 2024 Omar Bassam <omar.bassam88@gmail.com>
+;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -963,22 +964,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 "/" 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")))))))))
+ (let ((gcc-toolchain (assoc-ref inputs "gcc-toolchain"))
+ (core-min (assoc-ref inputs "coreutils-minimal")))
+ (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 commencement))
+ 'gcc-toolchain)))
(propagated-inputs (list janet))
(native-search-paths
(list $SSL_CERT_DIR $SSL_CERT_FILE))
--
2.47.0
prev parent reply other threads:[~2024-10-14 18:14 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-01 8:31 [bug#72925] Adding JPM package for Janet Omar Bassam
2024-09-04 8:22 ` [bug#72925] [PATCH] adding jpm package Omar Bassam
2024-09-05 14:50 ` Omar Bassam
2024-09-18 13:18 ` [bug#72925] Adding JPM package for Janet Suhail Singh
2024-09-18 15:34 ` Omar Bassam
2024-09-18 16:16 ` Suhail Singh
2024-09-30 8:12 ` [bug#72925] [PATCH v3] adding jpm package Omar Bassam
2024-10-01 0:06 ` Suhail Singh
2024-10-02 15:09 ` Omar Bassam
2024-10-02 18:21 ` Suhail Singh
2024-10-02 19:04 ` jgart via Guix-patches via
2024-10-02 19:12 ` Omar Bassam
2024-10-02 20:14 ` Suhail Singh
2024-10-02 20:27 ` Omar Bassam
2024-10-02 20:33 ` jgart via Guix-patches via
2024-10-02 21:39 ` Suhail Singh
2024-10-02 21:52 ` Omar Bassam
2024-10-02 22:07 ` Suhail Singh
2024-10-03 1:40 ` Suhail Singh
2024-10-03 7:14 ` Omar Bassam
2024-10-03 13:40 ` [bug#72925] Adding JPM package for Janet Suhail Singh
2024-10-03 19:45 ` Omar Bassam
2024-10-03 22:04 ` Omar Bassam
2024-10-04 16:00 ` Omar Bassam
2024-10-05 3:11 ` Suhail Singh
2024-10-02 20:27 ` [bug#72925] [PATCH v3] adding jpm package jgart via Guix-patches via
2024-10-02 14:36 ` [bug#72925] [PATCH v5] gnu: add " Omar Bassam
2024-10-02 14:50 ` [bug#72925] [PATCH v6] " Omar Bassam
2024-10-02 14:51 ` [bug#72925] [PATCH v7] " Omar Bassam
2024-10-04 15:17 ` Omar Bassam
2024-10-04 15:57 ` [bug#72925] [PATCH v8] " Omar Bassam
2024-10-05 3:28 ` Suhail Singh
2024-10-05 17:25 ` [bug#72925] Adding JPM package for Janet Suhail Singh
2024-10-05 3:15 ` [bug#72925] [PATCH v9] gnu: Add jpm Suhail Singh
2024-10-05 17:21 ` [bug#72925] [PATCH v10] " Suhail Singh
2024-10-06 13:21 ` Omar Bassam
2024-10-06 15:46 ` Suhail Singh
2024-10-06 19:48 ` Omar Bassam
2024-10-06 21:44 ` Suhail Singh
2024-10-07 18:24 ` Omar Bassam
2024-10-07 18:51 ` Suhail Singh
2024-10-07 19:17 ` Omar Bassam
2024-10-07 20:15 ` Suhail Singh
2024-10-07 21:13 ` Omar Bassam
2024-10-08 0:11 ` Suhail Singh
2024-10-08 3:49 ` Suhail Singh
2024-10-08 8:25 ` Omar Bassam
2024-10-08 13:39 ` Suhail Singh
2024-10-08 16:33 ` Omar Bassam
2024-10-08 22:01 ` Suhail Singh
2024-10-09 11:58 ` Omar Bassam
2024-10-09 13:12 ` Suhail Singh
2024-10-09 16:49 ` Omar Bassam
2024-10-09 17:15 ` Suhail Singh
2024-10-11 16:23 ` Omar Bassam
2024-10-11 16:45 ` Suhail Singh
2024-10-07 21:08 ` [bug#72925] [PATCH v11] gnu: Add jpm package Omar Bassam
2024-10-08 4:13 ` [bug#72925] [PATCH v12 0/2] " Suhail Singh
2024-10-08 4:14 ` [bug#72925] [PATCH v12 1/2] " Suhail Singh
2024-10-12 17:18 ` [bug#72925] Adding JPM package for Janet Ludovic Courtès
2024-10-12 20:17 ` Suhail Singh
2024-10-08 4:16 ` [bug#72925] [PATCH v12 2/2] gnu: Improve user-experience for jpm Suhail Singh
2024-10-12 17:22 ` [bug#72925] Adding JPM package for Janet Ludovic Courtès
2024-10-12 20:22 ` Suhail Singh
2024-10-12 21:14 ` Suhail Singh
2024-10-14 17:23 ` [bug#72925] [PATCH v13 0/2] Add jpm Suhail Singh
2024-10-14 17:25 ` [bug#72925] [PATCH v13 1/2] gnu: Add jpm package Suhail Singh
2024-10-14 17:26 ` Suhail Singh [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3cbf3de67871ab5aa7771d146e4dcdcef1a3e880.1728925129.git.suhail@bayesians.ca \
--to=suhailsingh247@gmail.com \
--cc=72925@debbugs.gnu.org \
--cc=cox.katherine.e+guix@gmail.com \
--cc=glv@posteo.net \
--cc=jgart@dismail.de \
--cc=ludo@gnu.org \
--cc=me@bonfacemunyoki.com \
--cc=omar.bassam88@gmail.com \
--cc=sharlatanus@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).