unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#51948] [PATCH] Meson needs proper wrapping
@ 2021-11-18 14:23 Vivien Kraus via Guix-patches via
       [not found] ` <handler.51948.B.16372454395205.ack@debbugs.gnu.org>
  2021-11-19 13:12 ` [bug#51948] [PATCH] Meson needs proper wrapping Ludovic Courtès
  0 siblings, 2 replies; 7+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2021-11-18 14:23 UTC (permalink / raw)
  To: 51948


[-- Attachment #1.1: Type: text/plain, Size: 334 bytes --]


Dear guix,

Meson needs to be wrapped, but the wrapping must not execute a new
process, if I understand correctly. I could use wrap-script, but I think
it’s more pythonic to set the path through sys.path rather than setting
an environment variable.

Now, this will create a world rebuild… What do you think?

Vivien


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Properly wrap meson --]
[-- Type: text/x-patch, Size: 1852 bytes --]

From 08845844e8e1a18232bf54f9f3f0b71d5e0c71ef Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Thu, 18 Nov 2021 15:17:52 +0100
Subject: [PATCH] gnu: meson: Extend the python path in the installed program.

* gnu/packages/build-tools.scm (meson) [phase wrap]: Wrap the python path as
python code.
---
 gnu/packages/build-tools.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 849101c2a4..ef5aa4bd35 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -283,7 +283,21 @@ (define-public meson
        #:phases (modify-phases %standard-phases
                   ;; Meson calls the various executables in out/bin through the
                   ;; Python interpreter, so we cannot use the shell wrapper.
-                  (delete 'wrap))))
+                  (replace 'wrap
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((path (string-split (getenv "GUIX_PYTHONPATH") #\:)))
+                        (substitute* (string-append (assoc-ref outputs "out") "/bin/meson")
+                          (("# EASY-INSTALL-ENTRY-SCRIPT")
+                           (format #f "\
+import sys
+~a
+# EASY-INSTALL-ENTRY-SCRIPT"
+                                   (string-join
+                                    (map (lambda (path)
+                                           (format #f "sys.path.insert(0, '~a')"
+                                                   path))
+                                         (reverse path))
+                                    "\n"))))))))))
     (inputs `(("ninja" ,ninja)))
     (propagated-inputs `(("python" ,python)))
     (home-page "https://mesonbuild.com/")
-- 
2.34.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 658 bytes --]

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-11-22 21:45 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-18 14:23 [bug#51948] [PATCH] Meson needs proper wrapping Vivien Kraus via Guix-patches via
     [not found] ` <handler.51948.B.16372454395205.ack@debbugs.gnu.org>
2021-11-18 16:00   ` [bug#51948] Acknowledgement ([PATCH] Meson needs proper wrapping) Vivien Kraus via Guix-patches via
2021-11-19 13:12 ` [bug#51948] [PATCH] Meson needs proper wrapping Ludovic Courtès
2021-11-19 13:20   ` Vivien Kraus via Guix-patches via
2021-11-19 22:17     ` Ludovic Courtès
2021-11-19 22:34       ` Vivien Kraus via Guix-patches via
2021-11-22 21:44         ` bug#51948: [PATCH] [core-updates-frozen] Wrap meson with python code Ludovic Courtès

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).