From patchwork Wed Nov 18 10:50:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 25178 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 4567D27BBF6; Wed, 18 Nov 2020 10:53:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D4DCE27BBF5 for ; Wed, 18 Nov 2020 10:53:43 +0000 (GMT) Received: from localhost ([::1]:47290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfL5q-0000gk-T0 for patchwork@mira.cbaines.net; Wed, 18 Nov 2020 05:53:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfL4E-0007j9-2Y for guix-patches@gnu.org; Wed, 18 Nov 2020 05:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kfL4D-0008Bl-NF for guix-patches@gnu.org; Wed, 18 Nov 2020 05:52:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kfL4D-000276-Kl for guix-patches@gnu.org; Wed, 18 Nov 2020 05:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44720] [PATCH] gnu: astroid: Fix inputs. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Nov 2020 10:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tanguy LE CARROUR Cc: 44720@debbugs.gnu.org Received: via spool by 44720-submit@debbugs.gnu.org id=B44720.16056966888082 (code B ref 44720); Wed, 18 Nov 2020 10:52:01 +0000 Received: (at 44720) by debbugs.gnu.org; 18 Nov 2020 10:51:28 +0000 Received: from localhost ([127.0.0.1]:34368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfL3f-00026I-Pa for submit@debbugs.gnu.org; Wed, 18 Nov 2020 05:51:28 -0500 Received: from flashner.co.il ([178.62.234.194]:59044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfL3d-000264-IL for 44720@debbugs.gnu.org; Wed, 18 Nov 2020 05:51:26 -0500 Received: from localhost (unknown [141.226.15.169]) by flashner.co.il (Postfix) with ESMTPSA id ECF8A4064E; Wed, 18 Nov 2020 10:51:18 +0000 (UTC) Date: Wed, 18 Nov 2020 12:50:45 +0200 From: Efraim Flashner Message-ID: <20201118105045.GB31988@E5400> References: <20201118083057.22752-1-tanguy@bioneland.org> <20201118100306.GA20593@E5400> <1605694859.a6kz43zy47.astroid@melmoth.none> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1605694859.a6kz43zy47.astroid@melmoth.none> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On Wed, Nov 18, 2020 at 11:22:30AM +0100, Tanguy LE CARROUR wrote: > Hi, > > > Excerpts from Efraim Flashner's message of November 18, 2020 11:03 am: > > Can you try the attached patch? It wraps the binary in GI_TYPELIB_PATH > > instead of propagating gsettings-desktop-schemas. > > Nop, does not work! :-( > > I still get the following error message on startup: > > ``` > (astroid:7236): GLib-GIO-ERROR **: 11:19:11.738: Settings schema 'org.gnome.desktop.interface' is not installed > ``` > I have another patch to try! diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 59f49d1247..1e2dd4035b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -729,7 +729,13 @@ mailpack. What can alterMIME do? #t)))) (build-system cmake-build-system) (arguments - `(#:configure-flags (list "-GNinja") + `(#:modules ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils) + (ice-9 match)) + #:imported-modules ((guix build glib-or-gtk-build-system) + ,@%cmake-build-system-modules) + #:configure-flags (list "-GNinja") #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-markdown-test @@ -759,7 +765,26 @@ mailpack. What can alterMIME do? #t)) (replace 'install (lambda _ - (invoke "ninja" "install")))))) + (invoke "ninja" "install"))) + (add-after 'install 'wrap-with-GI_TYPELIB_PATH + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (paths (map (match-lambda + ((outputs . directory) + (let ((girepodir (string-append + directory + "/lib/girepository-1.0"))) + (if (file-exists? girepodir) + girepodir + #f)))) + inputs))) + (wrap-program (string-append out "/bin/astroid") + `("GI_TYPELIB_PATH" ":" prefix ,(filter identity paths)))) + #t)) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs `(("glib-networking" ,glib-networking) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) @@ -781,6 +806,8 @@ mailpack. What can alterMIME do? ("python" ,python-wrapper) ("python-pygobject" ,python-pygobject) ("webkitgtk" ,webkitgtk))) + (propagated-inputs + `(("adwaita-icon-theme" ,adwaita-icon-theme))) ; Required for the thread view (home-page "https://astroidmail.github.io/") (synopsis "GTK frontend to the notmuch mail system") (description