From patchwork Sun Jul 23 08:47:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 52140 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 6AB4327BBEA; Sun, 23 Jul 2023 13:15:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C467827BBE2 for ; Sun, 23 Jul 2023 13:15:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNXze-0002Rw-Qz; Sun, 23 Jul 2023 08:15:22 -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 1qNXzL-0002PI-PB for guix-patches@gnu.org; Sun, 23 Jul 2023 08:15:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNXzL-0000zL-G7 for guix-patches@gnu.org; Sun, 23 Jul 2023 08:15:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNXzL-0007Bt-B6 for guix-patches@gnu.org; Sun, 23 Jul 2023 08:15:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 205/209] qt-utils: wrap QML2_IMPORT_PATH from '=' to 'prefix'. Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jul 2023 12:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64798@debbugs.gnu.org Received: via spool by 64798-submit@debbugs.gnu.org id=B64798.169011444927520 (code B ref 64798); Sun, 23 Jul 2023 12:15:03 +0000 Received: (at 64798) by debbugs.gnu.org; 23 Jul 2023 12:14:09 +0000 Received: from localhost ([127.0.0.1]:38955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNXyT-00079i-Ci for submit@debbugs.gnu.org; Sun, 23 Jul 2023 08:14:09 -0400 Received: from out203-205-221-210.mail.qq.com ([203.205.221.210]:49307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNXyN-00078G-Nn for 64798@debbugs.gnu.org; Sun, 23 Jul 2023 08:14:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690114435; bh=PuUszGQmRbiiC6za744LjyakYJg50UQchgy+GKhVkV0=; h=From:To:Subject:Date:In-Reply-To:References; b=cOqZ45zqN/bJtAHBaTfLmIaHBN9WmxS9zC+Xn7RP8zUB3hlEgUEG+jopPR1I8vjPq 2LJ4zB+7Rt2cYVUPlHv61iLwqXVEXrncfCqYiP8H97wftEEfDgvR5nMlMozSe9tJn5 nO9q4QZUxFe2C8dPckh3xW5oiYrdOGG6aLED8za4= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id 37312C61; Sun, 23 Jul 2023 20:13:51 +0800 X-QQ-mid: xmsmtpt1690114434tm9gsczps Message-ID: X-QQ-XMAILINFO: NG7xP+P+sy64jpTVp0s+w6kJVqHrGypRVcctJ5lc/d8EED/qQ+Rj1M+q9C8qdF XaGqqB8X0LC6n4/BY0vm/dF2VMBW0iP7lUEYry9aIFEdp4DxRe4CHBIVmg9FX3xupP4fOaZ4Be5D 6QYL/xAbiHL68s1Va0X9AQdtoCy55p0OutvgprDA334RW3g7/hcOPFjxxn+ZexnFSAVbyfT6lSP8 Uhn9vwVrddocY21MRjYM8ayujLY60mArXRiRcJcQoENyRWlZU0QibnEcl8rFDX27cJSX9qo/Qxuz HuFb9fCqTbVGDcgy0JzVPIjp3eO0tAkDRW57w/IMnoc7a2oYjowIxGoE6zw9QpDbkx6xB92RRyN9 PBt6b6MHmBvEJ6Uby8qDGUAv37YZsDuK19eXKtBQdq6p4aenzj/oi15s91tto53xTLvvY4GOYa1I nHLwP//DBpDiVa7c7hLkm/5bHRhN2uq1HosW+F7lxoPoyJ74qL3jbxLt48h6Kvs/mQJ1azaPtKdJ 2gzUA1bWNpU5HNekH9a/5g9zJXsgvQSy1NCObOhkVVdq/YnffKjeahyII7WdrYrqJilhNfMOOp3j sNfvTiKY48HfBMy38u9xP4qLaNqqUOneOaFjVByHx0NfMVgKdHipj95svH/jyxb5YrnwvtmyIIqm F4uYbFyboi3h4VebW7pFUDlaz5yCrrVVSWaq5N7t0HQ+gRGXdw+2BhNYR8HYM+ALEn1MDrFWsXsS TU64WcwObOFhNBPJm8QUF9ewaLfhSRU3YUIK+LuWn1yLdOhnNXiHoMaGO5ORp1BuhhS+kcPW6NH3 AGtZGOiB+gp1v1TWgSeYKDwVyexPi6K+fJtjmSH+XVUlBV6K7IZLZXtnq/W5UUnP/DOlt5C9P625 nUzOIpfUVviSQc8Pqe9n/XtvJceYXDPgfA6yl1ymK8SjTE6HEcoSKG13mvt9QIcSI7OmgfrJMLGJ 3ZQVwlBtSjZj+hy4dhxKpJnMYhfAarKSJghb16suM= X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= Date: Sun, 23 Jul 2023 16:47:05 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Zheng Junjie <873216071@qq.com> X-ACL-Warn: , Zheng Junjie via Guix-patches X-Patchwork-Original-From: Zheng Junjie via Guix-patches via From: Z572 <873216071@qq.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches some qml have optional dependencies or circular dependencies, but can't cut circular, so we get their optional/circular dependencies from environment. guix/build/qt-utils.scm(variables-for-wrapping): wrap QML2_IMPORT_PATH from '=' to 'prefix'. --- 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 f52e3f7af5..7d1b0e0e23 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -90,7 +90,7 @@ (define* (variables-for-wrapping base-directories output-directory '("XDG_CONFIG_DIRS" suffix directory "/etc/xdg") `("QT_PLUGIN_PATH" prefix directory ,(format #f "/lib/qt~a/plugins" qt-major-version)) - `("QML2_IMPORT_PATH" = directory + `("QML2_IMPORT_PATH" prefix directory ,(format #f "/lib/qt~a/qml" qt-major-version)) ;; QTWEBENGINEPROCESS_PATH accepts a single value, which makes 'exact the ;; most suitable environment variable type for it.