From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id aDW0MV9OJ2R+8gAASxT56A (envelope-from ) for ; Fri, 31 Mar 2023 23:19:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id IIEQMF9OJ2TTQgAAG6o9tA (envelope-from ) for ; Fri, 31 Mar 2023 23:19:27 +0200 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 9565EA7A7 for ; Fri, 31 Mar 2023 23:19:27 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piM9P-00086a-Ec; Fri, 31 Mar 2023 17:19:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phJKE-0007yT-Tq for bug-guix@gnu.org; Tue, 28 Mar 2023 20:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phJKE-0003fY-MI for bug-guix@gnu.org; Tue, 28 Mar 2023 20:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phJKE-0006Lk-3e for bug-guix@gnu.org; Tue, 28 Mar 2023 20:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#57742: [PATCH core-updates] build: qt-utils: Add prefix when wrapping QT_PLUGIN_PATH variable. References: In-Reply-To: Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 29 Mar 2023 00:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57742 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 57742@debbugs.gnu.org Cc: maxim.cournoyer@gmail.com Received: via spool by 57742-submit@debbugs.gnu.org id=B57742.168004833224361 (code B ref 57742); Wed, 29 Mar 2023 00:06:02 +0000 Received: (at 57742) by debbugs.gnu.org; 29 Mar 2023 00:05:32 +0000 Received: from localhost ([127.0.0.1]:50887 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phJJk-0006Kr-BK for submit@debbugs.gnu.org; Tue, 28 Mar 2023 20:05:32 -0400 Received: from mout-p-202.mailbox.org ([80.241.56.172]:60140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phJJi-0006KV-Bc for 57742@debbugs.gnu.org; Tue, 28 Mar 2023 20:05:31 -0400 Received: from smtp202.mailbox.org (unknown [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4PmRdZ3bMLz9sbf; Wed, 29 Mar 2023 02:05:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1680048322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UoCq8N6iqaPwfE1JbPH2kSvU+nRr0FEDt3nG1sB8liQ=; b=HVPASER02qRVNu2IGeaT56UAHDn5fEji+kY2w62BD80R7gsNgN0m1dDPYXHQ0NxesaciJW FcUvv0wCtKHou1uAda4gkm6EaetJmu7GC0ZxleSEZocYwRjcrP4GoPHEHi1QwW6OJDUru2 aNgsvPigmD3CsVsb56fnrwiAbCytmKvaK8rctnRYvBJK8Fx9HP8k9jGhLIqhLW2wPvFf0u rOGqWZg2DEPGehR6rumfBWpvmkvvmy5jYbAjFjWnrlBbR65Z4bRJzBElKnqrE1GG7xw6ou nRqstZ+7XVZxpPWVvIleQ5WMR7aA8b1TezgOATqoReHzShQncABOJv6c7qrdiQ== Date: Wed, 29 Mar 2023 00:05:11 +0000 Message-Id: <20230329000511.5277-1-antero@mailbox.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MBO-RS-META: ktu9mqxfnjbzwh9ze7jx4jk5dsmkgpjn X-MBO-RS-ID: dfde0a9733885d2a7d3 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Fri, 31 Mar 2023 17:19:09 -0400 X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Antero Mejr From: Antero Mejr via Bug reports for GNU Guix Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680297567; a=rsa-sha256; cv=none; b=FRIYSBaaNsIYwgF9vYhd3QC7oz/z2QnB8BMLOB9iXdZf2I2DH5PX3NVPrO6rgphNROOtQi kwd9qY/QF61uUzUherCsO8KEaKn83l6tPwKJiZ9uFWxjgYaHfNW7HOgo1w+Qx8555ipc/3 36ln1E2C1fxpVjK8emzk31kpQufGXjCib2EBMRUsvoAIThJFmiSAV6GQ2vj3BCXKphcxvH MQ4S5icwfJR8/zu+6cl4ev8lVeNTt4YJlBbaCbV1/VkzkCJ3tKwiGbtCIBHBdR+q2mOMTL 317F9zNjXfZ26jmGobbabSrW/5YjRDY4kbxyY7ZX+cqYYmTf6oqCPnB0cTAiDg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mailbox.org header.s=mail20150812 header.b=HVPASER0; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680297567; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=UoCq8N6iqaPwfE1JbPH2kSvU+nRr0FEDt3nG1sB8liQ=; b=BQD/NR1if5XlkT+cBxIYbtrXC7/f/dM3MpoPUoy651mJAqwRvIzmf9ZPbjQJoclXqA3bWW IdhKTztlKjITb3ufxc8YjNJboj5LBmkzgEpEGhe+yVOJ8600TEu+Rt2T2e9P3cu7znv6Ws nlvVOvyHzr3VoTNsntNsvh/yFIYn8Xw5K8oVMS8cDT3abkGYBCvoPuXQundfdHsnFXPSYE abS6Yu0qjbGxbTikJe/lUSDW1bOuy0Hc5IalfGVqw0lkxerkVNYmfgDxVuPRG/k9QQWKHX UgyvjHt0fc6MH7N3ctfUmVNXgwuaclWktmriw6XdagoSY213AhLC7ii2FQj15A== X-Migadu-Spam-Score: -2.32 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mailbox.org header.s=mail20150812 header.b=HVPASER0; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Spam-Score: -2.32 X-Migadu-Queue-Id: 9565EA7A7 X-TUID: FyXo8YfxUjZH This allows extension of QT_PLUGIN_PATH. QT programs will now work under Wayland when qt-wayland is installed. * guix/build/qt-utils.scm (variables-for-wrapping)[QT_PLUGIN_PATH]: Add prefix value to 'wrap-program' procedure call for QT_PLUGIN_PATH variable. --- Tested using Wayland and X (via XWayland), using plugin paths for QT5, QT6, or both. In all cases, QT selects the correct plugin if it's present anywhere in QT_PLUGIN_PATH. guix/build/qt-utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index 2e47f1bc02..b503659521 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -89,7 +89,7 @@ (define exists? (match file-type '("XDG_CONFIG_DIRS" suffix directory "/etc/xdg") ;; We wrap exactly to avoid potentially mixing Qt5/Qt6 components, which ;; would cause warnings, perhaps problems. - `("QT_PLUGIN_PATH" = directory + `("QT_PLUGIN_PATH" prefix directory ,(format #f "/lib/qt~a/plugins" qt-major-version)) `("QML2_IMPORT_PATH" = directory ,(format #f "/lib/qt~a/qml" qt-major-version)) -- 2.38.1