From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:53871) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iY5OD-0007hU-4e for guix-patches@gnu.org; Fri, 22 Nov 2019 04:38:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iY5OC-0005Yg-6k for guix-patches@gnu.org; Fri, 22 Nov 2019 04:38:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44949) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iY5OC-0005YY-3X for guix-patches@gnu.org; Fri, 22 Nov 2019 04:38:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iY5OB-0000hD-Uc for guix-patches@gnu.org; Fri, 22 Nov 2019 04:38:07 -0500 Subject: [bug#38319] [PATCH 2/4] guix: Fix wrap-qt-program. Resent-Message-ID: From: Hartmut Goebel Date: Fri, 22 Nov 2019 10:37:28 +0100 Message-Id: <20191122093730.6164-2-h.goebel@crazy-compilers.com> In-Reply-To: <20191122093730.6164-1-h.goebel@crazy-compilers.com> References: <20191122093730.6164-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38319@debbugs.gnu.org Paths added here need to match qtbase's native-search-path specifications. * guix/build/qt-utils.scm(wrap-qt-program): Change paths used for QML2_IMPORT_PATH and QT_PLUGIN_PATH. --- guix/build/qt-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index 48a32674e9..d2486ee86c 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -26,9 +26,9 @@ (if env-val (string-append env-val ":" path) path))) (let ((qml-path (suffix "QML2_IMPORT_PATH" - (string-append out "/qml"))) + (string-append out "/lib/qt5/qml"))) (plugin-path (suffix "QT_PLUGIN_PATH" - (string-append out "/plugins"))) + (string-append out "/lib/qt5/plugins"))) (xdg-data-path (suffix "XDG_DATA_DIRS" (string-append out "/share"))) (xdg-config-path (suffix "XDG_CONFIG_DIRS" -- 2.21.0