* 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 <suh...@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