From: "Suhail Singh" <suhailsingh247@gmail.com>
To: 74845@debbugs.gnu.org
Cc: Philip McGrath <philip@philipmcgrath.com>
Subject: bug#74845: [PATCH] gnu: racket: Ensure package launchers reference config directory.
Date: Mon, 16 Dec 2024 15:25:48 -0500 [thread overview]
Message-ID: <1e53d03ab96410d841ed154d1c866e07b2973f84.1734413825.git.suhail@bayesians.ca> (raw)
In-Reply-To: <87ttb8b7sa.fsf@gmail.com>
* gnu/packages/patches/racket-launcher-config-dir.patch: New file. With this
patch, packages installed at runtime via raco have configuration directory
correctly set.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/racket.scm (%racket-origin): Use it.
Change-Id: Ibba2d73b72a66e58a3c51dad8cf4fbf0c8969c4e
---
gnu/local.mk | 1 +
.../patches/racket-launcher-config-dir.patch | 33 +++++++++++++++++++
gnu/packages/racket.scm | 1 +
3 files changed, 35 insertions(+)
create mode 100644 gnu/packages/patches/racket-launcher-config-dir.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index ffb8eb6d29..774cc97a83 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2124,6 +2124,7 @@ dist_patch_DATA = \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
%D%/packages/patches/rtags-separate-rct.patch \
%D%/packages/patches/racket-chez-scheme-bin-sh.patch \
+ %D%/packages/patches/racket-launcher-config-dir.patch \
%D%/packages/patches/racket-rktio-bin-sh.patch \
%D%/packages/patches/remake-impure-dirs.patch \
%D%/packages/patches/restartd-update-robust.patch \
diff --git a/gnu/packages/patches/racket-launcher-config-dir.patch b/gnu/packages/patches/racket-launcher-config-dir.patch
new file mode 100644
index 0000000000..575e3b6151
--- /dev/null
+++ b/gnu/packages/patches/racket-launcher-config-dir.patch
@@ -0,0 +1,33 @@
+From 6b3aed3d71ea9481762de7bd42395704176b6625 Mon Sep 17 00:00:00 2001
+From: Suhail <suhail@bayesians.ca>
+Date: Mon, 16 Dec 2024 15:07:55 -0500
+Subject: [PATCH v2] racket: raco: Ensure launchers of packages include config
+ directory.
+
+---
+ racket/collects/launcher/launcher.rkt | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/racket/collects/launcher/launcher.rkt b/racket/collects/launcher/launcher.rkt
+index 0faacec4ce..2c77d55caf 100644
+--- a/racket/collects/launcher/launcher.rkt
++++ b/racket/collects/launcher/launcher.rkt
+@@ -405,7 +405,14 @@
+ [x-flags? (and (eq? kind 'mred)
+ (eq? (cross-system-type) 'unix)
+ (not (script-variant? variant)))]
+- [flags (let ([m (assq 'wm-class aux)])
++ [flags (let ([m (assq 'wm-class aux)]
++ [flags (if (or (member "-G" flags)
++ (member "--config" flags))
++ flags
++ (list* "-G"
++ (format "~a"
++ (find-system-path 'config-dir))
++ flags))])
+ (if m
+ (list* "-J" (cdr m) flags)
+ flags))]
+--
+2.47.1
+
diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm
index 1016915b47..75f333c468 100644
--- a/gnu/packages/racket.scm
+++ b/gnu/packages/racket.scm
@@ -214,6 +214,7 @@ (define %racket-origin
(base32 "0hg113fnd4nkvisf0ia9b367h02xfww9kysnb6fc6iac059lpard"))
(file-name (git-file-name "racket" %racket-version))
(patches (search-patches "racket-chez-scheme-bin-sh.patch"
+ "racket-launcher-config-dir.patch"
"racket-rktio-bin-sh.patch"))
(modules '((guix build utils)))
(snippet
base-commit: 2e8a8b3ddb4ca31b918d63ff2957c6da1424a2a9
prev parent reply other threads:[~2024-12-17 5:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-13 3:07 bug#74845: Guix racket: binaries installed via "raco pkg install" missing --config directory Suhail Singh
2024-12-16 20:25 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1e53d03ab96410d841ed154d1c866e07b2973f84.1734413825.git.suhail@bayesians.ca \
--to=suhailsingh247@gmail.com \
--cc=74845@debbugs.gnu.org \
--cc=philip@philipmcgrath.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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.