From patchwork Fri Nov 22 09:37:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 16186 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 5A9841772D; Fri, 22 Nov 2019 09:38:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1DFF717718 for ; Fri, 22 Nov 2019 09:38:32 +0000 (GMT) Received: from localhost ([::1]:48854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iY5OZ-0007t8-M9 for patchwork@mira.cbaines.net; Fri, 22 Nov 2019 04:38:31 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#38319] [PATCH 2/4] guix: Fix wrap-qt-program. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Nov 2019 09:38:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38319@debbugs.gnu.org Received: via spool by 38319-submit@debbugs.gnu.org id=B38319.15744154622617 (code B ref 38319); Fri, 22 Nov 2019 09:38:07 +0000 Received: (at 38319) by debbugs.gnu.org; 22 Nov 2019 09:37:42 +0000 Received: from localhost ([127.0.0.1]:53764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iY5Nm-0000g4-F2 for submit@debbugs.gnu.org; Fri, 22 Nov 2019 04:37:42 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:52621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iY5Ni-0000fr-3X for 38319@debbugs.gnu.org; Fri, 22 Nov 2019 04:37:38 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47KBDK32Fgz1rfQ0 for <38319@debbugs.gnu.org>; Fri, 22 Nov 2019 10:37:37 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47KBDK0Dlhz1qrbD for <38319@debbugs.gnu.org>; Fri, 22 Nov 2019 10:37:37 +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 FYFTISSxh5Kz for <38319@debbugs.gnu.org>; Fri, 22 Nov 2019 10:37:36 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-48-100.dynamic.mnet-online.de [188.174.48.100]) (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 <38319@debbugs.gnu.org>; Fri, 22 Nov 2019 10:37:36 +0100 (CET) Received: from lenashee.fritz.box (lenashee.fritz.box [192.168.110.31]) by hermia.goebel-consult.de (Postfix) with ESMTP id B7D6660197 for <38319@debbugs.gnu.org>; Fri, 22 Nov 2019 10:37:49 +0100 (CET) From: Hartmut Goebel Date: Fri, 22 Nov 2019 10:37:28 +0100 Message-Id: <20191122093730.6164-2-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191122093730.6164-1-h.goebel@crazy-compilers.com> References: <20191122093730.6164-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches 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"