From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 07 17:03:43 2021 Received: (at 47569) by debbugs.gnu.org; 7 Apr 2021 21:03:43 +0000 Received: from localhost ([127.0.0.1]:45470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUFKw-0006CZ-R1 for submit@debbugs.gnu.org; Wed, 07 Apr 2021 17:03:43 -0400 Received: from mail-qt1-f179.google.com ([209.85.160.179]:40828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUFKu-0006CM-QR for 47569@debbugs.gnu.org; Wed, 07 Apr 2021 17:03:41 -0400 Received: by mail-qt1-f179.google.com with SMTP id i19so14835876qtv.7 for <47569@debbugs.gnu.org>; Wed, 07 Apr 2021 14:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=66Dlpqa9B37haUlye3iipHSJhKCYDnWl58F3mva6aCI=; b=XJEPXN3uJJGZWPhjDc8czFZjvIGFLktk5RRt7AL3ZIVwCoDcNTJ71Of9bJH8o7b3bM uV6N3gxFifvg1SE1kWvarHS+01nlpuSqnX5MubtVkafinQi4pqJFzz4vGKd89/BD6ec/ VJmeWggHRN/iMEJrhV3nOPJ9lnN4N6uOaAOTphufmrgmtTXMYeW53Y8gp1to0gYHUUVn cVoJXE1Qixj73wzPkYlvGBSg9Ymc4N1JH1cz3tnmVYlIUdZYsTVgJyy6qJjXpCO64b5m EDRLwC8Si8sJwHSw4DxX4fmQUHwg5Z6VKmLVnKW4Pe2xYV2GD6GDqZKnCyoPHTdSW/J8 q2Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=66Dlpqa9B37haUlye3iipHSJhKCYDnWl58F3mva6aCI=; b=ocs28iAkNjptc238rSztzXUdRbrtAHGE9Z7eQwwJ0O99EbL76pZ9121q9o4gnNX/EF rZFUXe5TYM4+rGGomUGoVktS8jG7xJNvIEemqRCs6fKPiYm8uyz0EawyLdw0q38B548f 69aKMpYfG0aYPyZ12R3+gH+JwirwI00W/xcqB3MOF2st2eOvRoob9OCPrrbJQk6BvFoL bG6Y/KjatxBDG6KKDvLGT9EGBpfyAh7kjuPwP/TfzidoLVBYS6sAf7q8VHFzj7p71e2z NYiDtVc+penSNZ6MQri4QRP9exXPAc1w3uewZ50W8Pzp99E+H1lRJ3IUB6BzDbXDPn4l gUQw== X-Gm-Message-State: AOAM531Dwgo5KPyGz2ZDphD5N6AmrALHvSKrJmRjyOH5ykpKp8A/Wob5 CKMTr41SISpRZaiBxM7b1Jwhr3Nv0y0= X-Google-Smtp-Source: ABdhPJxFyCVHNcx4eiIIQv5FJ6eq35tW7znCf9qdf7rX+93dMd9yoJVtSFNl0Xr4hcbApcuv8ecZoQ== X-Received: by 2002:ac8:110f:: with SMTP id c15mr4551490qtj.251.1617829415182; Wed, 07 Apr 2021 14:03:35 -0700 (PDT) Received: from hurd (mtl.savoirfairelinux.net. [208.88.110.46]) by smtp.gmail.com with ESMTPSA id g17sm16931667qts.93.2021.04.07.14.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 14:03:34 -0700 (PDT) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#47569: =?utf-8?Q?=E2=80=98qt-build-system=E2=80=99?= retains too many references via wrappers References: <87czvczbsv.fsf@inria.fr> <87blaurbya.fsf@gmail.com> <878s5wseaz.fsf@gnu.org> <87r1jnmu0v.fsf@gnu.org> <87zgybl35g.fsf@gnu.org> Date: Wed, 07 Apr 2021 17:03:33 -0400 In-Reply-To: <87zgybl35g.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Tue, 06 Apr 2021 19:43:39 +0200") Message-ID: <87sg41n6xm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47569 Cc: 47569@debbugs.gnu.org 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 (-) Hi Ludo, I just had another thought on this! Ludovic Court=C3=A8s writes: [...] > - (filter > - (lambda (var-to-wrap) (not (null? (last var-to-wrap)))) > - (map > - (lambda (var-spec) > - `(,(first var-spec) =3D ,(collect-sub-dirs base-directories (last = 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"))))) > + (filter-map > + (match-lambda > + ((variable directory selectors ...) > + (match (collect-sub-dirs base-directories directory > + selectors) > + (() > + #f) > + (directories > + `(,variable =3D ,directories))))) > + > + ;; These shall match the search-path-specification for Qt and KDE > + ;; libraries. > + (list '("XDG_DATA_DIRS" "/share" > + > + ;; These are "selectors": consider /share if and only if these > + ;; sub-directories exist. This avoids adding irrelevant pack= ages > + ;; to XDG_DATA_DIRS just because they have a /share sub-direc= tory. > + "/glib-2.0/schemas" "/sounds" "/themes" > + "/cursors" "/wallpapers" "/icons" "/mime") > + '("XDG_CONFIG_DIRS" "/etc/xdg") > + '("QT_PLUGIN_PATH" "/lib/qt5/plugins") > + '("QML2_IMPORT_PATH" "/lib/qt5/qml")))) > > (define* (wrap-all-programs #:key inputs outputs > (qt-wrap-excluded-outputs '()) Seeing a growing number of packages require a custom wrap phase for qtwebengine, I think the following additions could make sense to be incorporated as part as this Qt-world rebuild: 2 files changed, 5 insertions(+), 1 deletion(-) gnu/packages/qt.scm | 3 +++ guix/build/qt-build-system.scm | 3 ++- modified gnu/packages/qt.scm @@ -538,6 +538,9 @@ system, and the core design of Django is reused in Gran= tlee.") (search-path-specification (variable "QT_PLUGIN_PATH") (files '("lib/qt5/plugins"))) + (search-path-specification + (variable "QTWEBENGINEPROCESS_PATH") + (files '("lib/qt5/libexec/QtWebEngineProcess"))) (search-path-specification (variable "XDG_DATA_DIRS") (files '("share"))) modified guix/build/qt-build-system.scm @@ -86,7 +86,8 @@ "/cursors" "/wallpapers" "/icons" "/mime") '("XDG_CONFIG_DIRS" "/etc/xdg") '("QT_PLUGIN_PATH" "/lib/qt5/plugins") - '("QML2_IMPORT_PATH" "/lib/qt5/qml")))) + '("QML2_IMPORT_PATH" "/lib/qt5/qml") + '("QTWEBENGINEPROCESS_PATH" "lib/qt5/libexec/QtWebEngineProcess")= ))) (define* (wrap-all-programs #:key inputs outputs (qt-wrap-excluded-outputs '()) Thanks, Maxim