From patchwork Thu Nov 18 16:00:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 34622 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 7C67727BBE3; Thu, 18 Nov 2021 16:02:12 +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 4478427BBE1 for ; Thu, 18 Nov 2021 16:02:12 +0000 (GMT) Received: from localhost ([::1]:38568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnjrX-0005lm-C1 for patchwork@mira.cbaines.net; Thu, 18 Nov 2021 11:02:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnjrO-0005l2-Ka for guix-patches@gnu.org; Thu, 18 Nov 2021 11:02:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnjrO-0003Gb-Ba for guix-patches@gnu.org; Thu, 18 Nov 2021 11:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnjrO-0007PN-9c for guix-patches@gnu.org; Thu, 18 Nov 2021 11:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51948] Acknowledgement ([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 16:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51948 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51948@debbugs.gnu.org Received: via spool by 51948-submit@debbugs.gnu.org id=B51948.163725129028407 (code B ref 51948); Thu, 18 Nov 2021 16:02:02 +0000 Received: (at 51948) by debbugs.gnu.org; 18 Nov 2021 16:01:30 +0000 Received: from localhost ([127.0.0.1]:36953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnjqs-0007O7-97 for submit@debbugs.gnu.org; Thu, 18 Nov 2021 11:01:30 -0500 Received: from planete-kraus.eu ([89.234.140.182]:56256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnjqq-0007Nw-4r for 51948@debbugs.gnu.org; Thu, 18 Nov 2021 11:01:29 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 1f0eee95 for <51948@debbugs.gnu.org>; Thu, 18 Nov 2021 16:01:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= references:from:to:subject:date:in-reply-to:message-id :mime-version:content-type; s=dkim; bh=JZXC09eCkVty4rp0FHA0Up9LG Ek=; b=hiU3I8yrtuUh0v/kjucTSFjkB9IMSE8CM3F3TH3juQDuTLXNfsJRVrfAK VzuwVVgGhLEEQAGmrLVm4xR/gDiOm95riQoKeVp0XwEzCIetXxSilOEQ1dz2vIt6 m/uLVjj4eXM3rr9Q9buzJ+n4IsspzUc98VaktkkzA6lJmaPTTY= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 306e78d1 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO) for <51948@debbugs.gnu.org>; Thu, 18 Nov 2021 16:01:23 +0000 (UTC) References: <87r1bda6ff.fsf@planete-kraus.eu> User-agent: mu4e 1.6.10; emacs 27.2 Date: Thu, 18 Nov 2021 17:00:25 +0100 In-reply-to: Message-ID: <87mtm1a1wx.fsf@planete-kraus.eu> MIME-Version: 1.0 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 If I put the code in a new variable, we avoid a world rebuild, is it better? Vivien From f25082c0a695734aaada2d286ef1770de5f99c2b 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-wrapped): New variable. --- gnu/packages/build-tools.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 849101c2a4..646e28e0c6 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -297,6 +297,31 @@ (define-public meson resembles Python.") (license license:asl2.0))) +(define-public meson-wrapped + (package/inherit meson + (arguments + `(;; FIXME: Tests require many additional inputs and patching many + ;; hard-coded file system locations in "run_unittests.py". + #:tests? #f + #:phases (modify-phases %standard-phases + ;; Meson calls the various executables in out/bin through the + ;; Python interpreter, so we cannot use the shell wrapper. + (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")))))))))))) + ;;; This older Meson variant is kept for now for gtkmm and others that may ;;; have problems with 0.60. (define-public meson-0.59 -- 2.34.0