From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id OE9sGwF5lmGeRwAAgWs5BA (envelope-from ) for ; Thu, 18 Nov 2021 17:02:09 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id AEASFwF5lmFTEwAA1q6Kng (envelope-from ) for ; Thu, 18 Nov 2021 16:02:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3244410EB0 for ; Thu, 18 Nov 2021 17:02:09 +0100 (CET) Received: from localhost ([::1]:38568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnjrU-0005lm-BU for larch@yhetil.org; Thu, 18 Nov 2021 11:02:08 -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 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches From: Vivien Kraus via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637251329; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=FrquUE+q2gwFD3JE6UDIyQNr+nTAW3dby4ObtXUplUA=; b=La/LqEeLqDVTGCIJR9rdhfkNrGjWgTTHeS/+qJTfm6zwvYJfP7sys6dVLcCkIwPm9zD4LM dC6DyA96jVJoagtpF5EtV5I1T17O2hrSVzjO6KBS3UflY7vusat3gSnT1ZDs8Ldh/Jh3pL +fCWAYBGn+/dyANlOBMj/BXoJmmI2A5ff1UcOIQfj8uBZioVTR2AxoTVOf3bfLY7TBmA+C 92L7CcIZVEHTCEulVVX0k9SJa7lIdgcHsmqHOgDKcXx/4msUjwWHgStVFaRMm2lkWKuqs2 rDHavGcZT9dIWWulHGcaIB0ECdBx0U7gBY3z86ak9SozT5CpAp/NwHeN01blRQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637251329; a=rsa-sha256; cv=none; b=UffIS8CYoKr90t5Rxh6EhHB40Ed0sTTTWNcrGaI7TPA7ZkgFdD8sdwJhZmFysp5FR53xf/ q/d4l0yGW7481E8LzgJ8Ga5ybETH0ojZR5VfvOWYxxbKM5ln0GJ2ZceBeJTR5/OBUFc4X9 bqB3S5z8sKiFWSjopKwuRttpYOz9pPmpmAAXebZgei4qMBvinmTv8HbehkitFBuPsMsSkZ WfGY9zCi6w9rX2rfWqJN51ftGC2TF1gw+0mR0X83/YU61p5AwF5VFpjL6fvIo9laciWQcB nv/qjfXm2y38YhqxBxUnkRm7oXuGW8M2yyVwZd2MzhD/AcgfHzTWiz6exu4wjw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=hiU3I8yr; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.96 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=hiU3I8yr; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 3244410EB0 X-Spam-Score: -3.96 X-Migadu-Scanner: scn0.migadu.com X-TUID: zyIQbh5NbfK8 --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain If I put the code in a new variable, we avoid a world rebuild, is it better? Vivien --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-meson-Extend-the-python-path-in-the-installed-pr.patch Content-Transfer-Encoding: quoted-printable Content-Description: New meson-wrapped package From=20f25082c0a695734aaada2d286ef1770de5f99c2b 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 progra= m. * gnu/packages/build-tools.scm (meson-wrapped): New variable. =2D-- 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 =2D-- 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))) =20 +(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 throug= h the + ;; Python interpreter, so we cannot use the shell wrappe= r. + (replace 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((path (string-split (getenv "GUIX_PYTHONPATH")= #\:))) + (substitute* (string-append (assoc-ref outputs "ou= t") "/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 =2D-=20 2.34.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGWeM4ACgkQO7C8EjLY uCz6QQv9ER6cXQI3BJCKRQ5NMgKBEyU+hUhNW5lVz0eX/6gKDMKHqsGWWZegVxZf t7ExjXPfVZcdJxdgMgpaadK1vckCkyYnjUrmu2T4pcVQux2ZNiL0ZPEZbLXvafWs NrT7sScExpcgleoMHulgNfq4EO6tHzg+CQY7PfROS7qp44VOnvQ6Q2JMmi9nQP+1 ZQtip+SLrwPfJX0/YWBfseC7KYy7x/51OyyFSgl53bty35YXiVPbhrVMMR6mENL8 jGbBqQ4V+ZlOKGru9jb6t7bdlC5DXl6svDkkwQVpRnRvvlWo4LEtNelXg2PKTwI3 FCvXNrpLB/yrb5fe1/QH9jFUCJBrWGaLhMitfLaake0RvWUHsSW424D7UAjsPhfv 7ZE3mztxaUG95z1/MgEQ3gAjPWsXlILOPzuA5Lc2VwcC5z2LejXQm9tICz3tIb95 Z/O7U36chM1NWNikvh3Z39DjK7vcQFBPAsES74V1XFQUEUm4jibBG/DqsEZNVibJ 8pv3+RtQ =16yN -----END PGP SIGNATURE----- --==-=-=--