From patchwork Thu Nov 18 14:23:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 34618 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 A1E1327BBE3; Thu, 18 Nov 2021 14:24:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 358D227BBE1 for ; Thu, 18 Nov 2021 14:24:17 +0000 (GMT) Received: from localhost ([::1]:52228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mniKm-0006vQ-DW for patchwork@mira.cbaines.net; Thu, 18 Nov 2021 09:24:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mniKY-0006v5-KC for guix-patches@gnu.org; Thu, 18 Nov 2021 09:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52008) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mniKY-0003HA-CI for guix-patches@gnu.org; Thu, 18 Nov 2021 09:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mniKY-0001MC-2Y for guix-patches@gnu.org; Thu, 18 Nov 2021 09:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51948] [PATCH] Meson needs proper wrapping Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Nov 2021 14:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51948 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51948@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16372454395205 (code B ref -1); Thu, 18 Nov 2021 14:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Nov 2021 14:23:59 +0000 Received: from localhost ([127.0.0.1]:35321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mniKU-0001Lt-LZ for submit@debbugs.gnu.org; Thu, 18 Nov 2021 09:23:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:53878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mniKT-0001Ln-Du for submit@debbugs.gnu.org; Thu, 18 Nov 2021 09:23:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mniKT-0006uI-3z for guix-patches@gnu.org; Thu, 18 Nov 2021 09:23:57 -0500 Received: from [2a00:5881:4008:2810::309] (port=53408 helo=planete-kraus.eu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1mniKQ-0003FH-Gi for guix-patches@gnu.org; Thu, 18 Nov 2021 09:23:56 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 68caf435 for ; Thu, 18 Nov 2021 14:23:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :to:subject:date:message-id:mime-version:content-type; s=dkim; bh=8tvgfrHmS53oTtKKcELspQ/+0Lc=; b=Qn00iZE5POYhBVtDeI9A+MjSsxp6 m1JTMeYek62Rww7StPNIxjqPwtsiNYw9+DkbLKPNp3OY2GZ0cwIc/g+W8wA8/PWN TdqBZLK+yl6HTrkL5sp/srIyB43d04Ej4YkrMLRClxS/7gAG7LCT0cDJMIEseFbY 6OxBHAiLR6mNoHU= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id d29a7894 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Thu, 18 Nov 2021 14:23:48 +0000 (UTC) Date: Thu, 18 Nov 2021 15:23:48 +0100 Message-ID: <87r1bda6ff.fsf@planete-kraus.eu> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:5881:4008:2810::309 (failed) Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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" Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus X-getmail-retrieved-from-mailbox: Patches 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 From 08845844e8e1a18232bf54f9f3f0b71d5e0c71ef Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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