From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 13 10:41:49 2020 Received: (at submit) by debbugs.gnu.org; 13 Dec 2020 15:41:49 +0000 Received: from localhost ([127.0.0.1]:49941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1koTVN-0007Gb-4f for submit@debbugs.gnu.org; Sun, 13 Dec 2020 10:41:49 -0500 Received: from lists.gnu.org ([209.51.188.17]:38110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1koTVL-0007GQ-0S for submit@debbugs.gnu.org; Sun, 13 Dec 2020 10:41:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koTVK-0007nf-Pk for guix-patches@gnu.org; Sun, 13 Dec 2020 10:41:46 -0500 Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:49373) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koTVI-0000It-N0 for guix-patches@gnu.org; Sun, 13 Dec 2020 10:41:46 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4Cv7zn5Qm3z1rwb8 for ; Sun, 13 Dec 2020 16:41:41 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4Cv7zn5Hw6z1tTYt for ; Sun, 13 Dec 2020 16:41:41 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id IXFSGtKJ8QXz for ; Sun, 13 Dec 2020 16:41:41 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-53-196.dynamic.mnet-online.de [188.174.53.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Sun, 13 Dec 2020 16:41:41 +0100 (CET) Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 91FF7602A4 for ; Sun, 13 Dec 2020 16:49:14 +0100 (CET) From: Hartmut Goebel To: guix-patches@gnu.org Subject: [PATCH] guix: qt-build-system: Wrapped executables honor user's envvars. Date: Sun, 13 Dec 2020 16:41:38 +0100 Message-Id: <93d83462d1445ffd001039eebb1f2a84e6ccf3a9.1607873941.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2001:a60:0:28:0:1:25:1; envelope-from=h.goebel@crazy-compilers.com; helo=mail-out.m-online.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Prior to this change, wrappers did set the specified environment variables to a fixed value, overwriting any user settings. This inhibited propagating e.g. XDG_DATA_DIRS from a profile to the application. Now user environment variables are prefixed (if the variable defines some "binary" search path, e.g. QT_PLUGIN_PATH) or suffixed (if the variable defines some config or data search path, e.g. XDG_DATA_DIRS). The code could also allow to overwrite, anyhow currently no variable is defined like this. * guix/build/qt-build-system.scm (variables-for-wrapping): For each env-var to be wrapped, specify whether it should prefix, suffix or overwrite the user's variable. --- guix/build/qt-build-system.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm index 005157b0a4..72d2d3b03b 100644 --- a/guix/build/qt-build-system.scm +++ b/guix/build/qt-build-system.scm @@ -60,14 +60,14 @@ (lambda (var-to-wrap) (not (null? (last var-to-wrap)))) (map (lambda (var-spec) - `(,(first var-spec) = ,(collect-sub-dirs base-directories (last var-spec)))) + (list (first var-spec) (second var-spec) (collect-sub-dirs base-directories (third var-spec)))) (list ;; these shall match the search-path-specification for Qt and KDE ;; libraries - '("XDG_DATA_DIRS" "/share") - '("XDG_CONFIG_DIRS" "/etc/xdg") - '("QT_PLUGIN_PATH" "/lib/qt5/plugins") - '("QML2_IMPORT_PATH" "/lib/qt5/qml"))))) + '("XDG_DATA_DIRS" suffix "/share") + '("XDG_CONFIG_DIRS" suffix "/etc/xdg") + '("QT_PLUGIN_PATH" prefix "/lib/qt5/plugins") + '("QML2_IMPORT_PATH" prefix "/lib/qt5/qml"))))) (define* (wrap-all-programs #:key inputs outputs (qt-wrap-excluded-outputs '()) -- 2.21.3 From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 17 23:15:12 2020 Received: (at 45221) by debbugs.gnu.org; 18 Dec 2020 04:15:12 +0000 Received: from localhost ([127.0.0.1]:37476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kq7Ae-0006Bh-Ag for submit@debbugs.gnu.org; Thu, 17 Dec 2020 23:15:12 -0500 Received: from mail-m975.mail.163.com ([123.126.97.5]:40900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kq7AZ-0006BO-6K for 45221@debbugs.gnu.org; Thu, 17 Dec 2020 23:15:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=Nz3u7 qusqGI5v5WRHiG0ng+pj2aKW0XESSn214XcZuE=; b=lv3iH+ssiaLrt4+nh8R1K s/0vVhC1VXIJ4SFvRSD/wL0FjxoA0oKDGSw3sSS5eV7jWlcUda1CrcWoFGm5Dp4z RlikD/eXIlpVdILYg26gweYtlPHh0h5Wg/4Ae7BdHKDc7gbA/aA/zpFPRJPPWdP8 t6Qd5k0SpVtJ8p6RVSLSLo= Received: from asus-laptop (unknown [27.39.89.162]) by smtp5 (Coremail) with SMTP id HdxpCgCXt3u4LNxfjBV9Fw--.35S2; Fri, 18 Dec 2020 12:14:54 +0800 (CST) User-agent: mu4e 1.4.13; emacs 27.1 From: Zhu Zihao To: 45221@debbugs.gnu.org Subject: Re: [PATCH] guix: qt-build-system: Wrapped executables honor user's envvars. Date: Fri, 18 Dec 2020 12:14:44 +0800 Message-ID: <86r1nnzr63.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: HdxpCgCXt3u4LNxfjBV9Fw--.35S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrKFy8XF43JryUKF1Uuw1fXrb_yoWxZrX_Kr Z5J3yDWrWjqry3trWakay3CFWfWFyfXr18Wayjga1YgryDXanrXrZ7Cr95Zw1Ygwn7GFn5 C39rtrZ7ZrW3ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUUQzV7UUUUU== X-Originating-IP: [27.39.89.162] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbB8Qf+r12MYUJ1sAAAsQ X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 45221 Cc: h.goebel@crazy-compilers.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Good work! I think this can help solve #45193[1]. And there're still some issues I mentioned in that issues. 1. We may need to fix `wrap-qt-program` in qt-utils.scm. It's implementation is quite weird(See my reply in [1]). Or we can remove this function and make package use (assoc-ref qt-build-system:%standard-phases 'qt-wrap) instead. 2. We should search directories in outputs, now we just search all inputs. Some Qt programs were deployed with a bundle of Qt plugins in their prefix. If we miss these dirs, they won't run. [1]: https://issues.guix.gnu.org/45193 -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCX9wstBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh9cCgEA+4F+klhZPot+usbQXY2O+rraohi5 A1lP+JD3H8SUt2gBANow0aDvq1bZhH4/kMZuEHt/To9oibkpWD/f8F/0zYAJ =Xd1x -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 11 11:05:06 2021 Received: (at 45221-close) by debbugs.gnu.org; 11 Jan 2021 16:05:06 +0000 Received: from localhost ([127.0.0.1]:58034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyzgn-0004NN-Ti for submit@debbugs.gnu.org; Mon, 11 Jan 2021 11:05:06 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:56370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyzgk-0004MJ-ME for 45221-close@debbugs.gnu.org; Mon, 11 Jan 2021 11:05:03 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4DDz7K3YP7z1qt3d for <45221-close@debbugs.gnu.org>; Mon, 11 Jan 2021 17:05:01 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4DDz7K3SCyz1qqlC for <45221-close@debbugs.gnu.org>; Mon, 11 Jan 2021 17:05:01 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id WmwCs5w2POdv for <45221-close@debbugs.gnu.org>; Mon, 11 Jan 2021 17:05:00 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-55-154.dynamic.mnet-online.de [188.174.55.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <45221-close@debbugs.gnu.org>; Mon, 11 Jan 2021 17:05:00 +0100 (CET) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id DB63B60355 for <45221-close@debbugs.gnu.org>; Mon, 11 Jan 2021 17:04:57 +0100 (CET) Subject: Re: [PATCH] guix: qt-build-system: Wrapped executables honor user's envvars. From: Hartmut Goebel To: 45221-close@debbugs.gnu.org References: <86r1nnzr63.fsf@163.com> Organization: crazy-compilers.com Message-ID: <9f9b879e-8ef3-c47b-d75b-5ba1cea5d12c@crazy-compilers.com> Date: Mon, 11 Jan 2021 17:04:57 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <86r1nnzr63.fsf@163.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 45221-close X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This patch has been superseded by http://issues.guix.gnu.org/45784 and following, esp. http://issues.guix.gnu.org/45785 From unknown Thu Sep 25 05:17:04 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 09 Feb 2021 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator