* gnu/packages/mail.scm (astroid)[native-inputs]: Remove gsettings-desktop-schemas. [propagated-inputs]: Add adwaita-icon-theme and gsettings-desktop-schemas. --- gnu/packages/mail.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c5f4472c83..adf83f7948 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -761,7 +761,6 @@ mailpack. What can alterMIME do? (invoke "ninja" "install")))))) (native-inputs `(("glib-networking" ,glib-networking) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gnupg" ,gnupg) ("ninja" ,ninja) ("pkg-config" ,pkg-config) @@ -780,6 +779,9 @@ 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 + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) ; Required to start (home-page "https://astroidmail.github.io/") (synopsis "GTK frontend to the notmuch mail system") (description -- 2.29.2
[-- Attachment #1.1: Type: text/plain, Size: 338 bytes --] Can you try the attached patch? It wraps the binary in GI_TYPELIB_PATH instead of propagating gsettings-desktop-schemas. -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #1.2: 0001-gnu-astroid-Fix-build.patch --] [-- Type: text/plain, Size: 2776 bytes --] From c2ca21180acd1f655b71040bf3266761bb27d2cf Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour <tanguy@bioneland.org> Date: Wed, 18 Nov 2020 09:30:57 +0100 Subject: [PATCH] gnu: astroid: Fix build. * gnu/packages/mail.scm (astroid)[arguments]: Add phase to wrap binary in GI_TYPELIB_PATH. [propagated-inputs]: Add adwaita-icon-theme. Signed-off-by: Efraim Flashner <efraim@flashner.co.il> --- gnu/packages/mail.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 59f49d1247..741130eab6 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -729,7 +729,10 @@ mailpack. What can alterMIME do? #t)))) (build-system cmake-build-system) (arguments - `(#:configure-flags (list "-GNinja") + `(#:modules ((guix build cmake-build-system) + (guix build utils) + (ice-9 match)) + #:configure-flags (list "-GNinja") #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-markdown-test @@ -759,7 +762,22 @@ 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))))) (native-inputs `(("glib-networking" ,glib-networking) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) @@ -781,6 +799,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 -- 2.29.2 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]
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
```
--
Tanguy
[-- Attachment #1.1: Type: text/plain, Size: 760 bytes --] 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! -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #1.2: 0001-gnu-astroid-Fix-build.patch --] [-- Type: text/plain, Size: 3356 bytes --] From 57765196f855fe1a0674bfc48f2cdb5995d1c891 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour <tanguy@bioneland.org> Date: Wed, 18 Nov 2020 09:30:57 +0100 Subject: [PATCH] gnu: astroid: Fix build. * gnu/packages/mail.scm (astroid)[arguments]: Add phase to wrap binary in GI_TYPELIB_PATH. Add 'glib-or-gtk-compile-schemas and 'glib-or-gtk-wrap phases from the glib-or-gtk build system. [propagated-inputs]: Add adwaita-icon-theme. Signed-off-by: Efraim Flashner <efraim@flashner.co.il> --- gnu/packages/mail.scm | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) 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 -- 2.29.2 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]
Hi,
Excerpts from Efraim Flashner's message of November 18, 2020 11:50 am:
> On Wed, Nov 18, 2020 at 11:22:30AM +0100, Tanguy LE CARROUR wrote:
>> 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!
And this one works fine! I'll have to read it again, just to make sure I
understand everything! ^_^'
Thanks
--
Tanguy
[-- Attachment #1: Type: text/plain, Size: 1407 bytes --] On Wed, Nov 18, 2020 at 02:58:13PM +0100, Tanguy LE CARROUR wrote: > Hi, > > > Excerpts from Efraim Flashner's message of November 18, 2020 11:50 am: > > On Wed, Nov 18, 2020 at 11:22:30AM +0100, Tanguy LE CARROUR wrote: > >> 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! > > And this one works fine! I'll have to read it again, just to make sure I > understand everything! ^_^' Yay! The short version is 'wrap-with-GI_TYPELIB_PATH makes sure the TYPELIB path is set correctly. When you said the settings schema was missing I figured it needed the compile-schema phase from the glib-or-gtk build-system, and it almost definitely needed the 'wrap phase from glib-or-gtk also. > > Thanks > NP :) Patch pushed! -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]