Evolution needs gsettings-desktop-schemas

DoneSubmitted by Martin Becze.
Details
3 participants
  • Tobias Geerinckx-Rice
  • Martin Becze
  • Ricardo Wurmus
Owner
unassigned
Severity
normal
M
M
Martin Becze wrote on 2 Aug 2019 00:14
(address . bug-guix@gnu.org)
18ecfb89-c1e7-3985-06d1-24a9abe0ecb7@riseup.net
Evolution will crash immediate if gsettings-desktop-schemas is not alsoinstalled
N
[PATCH] added gsettings-desktop-schema to progragated inputs
(address . 36896@debbugs.gnu.org)(name . null)(address . mjbecze@riseup.net)
20190802022815.13670-1-mjbecze@riseup.net
--- gnu/packages/gnome.scm | 2 ++ 1 file changed, 2 insertions(+)
Toggle diff (15 lines)diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scmindex 3f7bbac214..c33653f361 100644--- a/gnu/packages/gnome.scm+++ b/gnu/packages/gnome.scm@@ -8074,6 +8074,8 @@ generic enough to work for everyone.") ("openldap" ,openldap) ("webkitgtk" ,webkitgtk) ("ytnef" ,ytnef)))+ (propagated-inputs+ `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (home-page "https://gitlab.gnome.org/GNOME/evolution") (synopsis "Manage your email, contacts and schedule") (description "Evolution is a personal information management application-- 2.22.0
M
M
mjbecze wrote on 5 Aug 2019 03:24
(address . 36896@debbugs.gnu.org)
777cf4d0d6ef5f0ec6e5dc70f55caff4@riseup.net
On 2019-08-01 22:28, null wrote:
Toggle quote (18 lines)> ---> gnu/packages/gnome.scm | 2 ++> 1 file changed, 2 insertions(+)> > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm> index 3f7bbac214..c33653f361 100644> --- a/gnu/packages/gnome.scm> +++ b/gnu/packages/gnome.scm> @@ -8074,6 +8074,8 @@ generic enough to work for everyone.")> ("openldap" ,openldap)> ("webkitgtk" ,webkitgtk)> ("ytnef" ,ytnef)))> + (propagated-inputs> + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))> (home-page "https://gitlab.gnome.org/GNOME/evolution")> (synopsis "Manage your email, contacts and schedule")> (description "Evolution is a personal information management application
bump :)
R
R
Ricardo Wurmus wrote on 5 Aug 2019 13:40
Re: bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs
(name . null)(address . mjbecze@riseup.net)(address . 36896@debbugs.gnu.org)
87sgqfzvpi.fsf@elephly.net
Hi,
null <mjbecze@riseup.net> writes:
Toggle quote (18 lines)> ---> gnu/packages/gnome.scm | 2 ++> 1 file changed, 2 insertions(+)>> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm> index 3f7bbac214..c33653f361 100644> --- a/gnu/packages/gnome.scm> +++ b/gnu/packages/gnome.scm> @@ -8074,6 +8074,8 @@ generic enough to work for everyone.")> ("openldap" ,openldap)> ("webkitgtk" ,webkitgtk)> ("ytnef" ,ytnef)))> + (propagated-inputs> + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))> (home-page "https://gitlab.gnome.org/GNOME/evolution")> (synopsis "Manage your email, contacts and schedule")> (description "Evolution is a personal information management application
Thank you for the patch.
I’m not sure this is the right thing to do. I don’t think we everpropagate this package. Instead we often wrap executables so thatrelevant environment variables are set. Would this work in the case ofEvolution as well?
-- Ricardo
M
M
Martin Becze wrote on 5 Aug 2019 21:17
(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 36896@debbugs.gnu.org)
c5cf4e57ea824c6cb796c298047a2b32@riseup.net
On 2019-08-05 07:40, Ricardo Wurmus wrote:
Toggle quote (29 lines)> Hi,> > null <mjbecze@riseup.net> writes:> >> --->> gnu/packages/gnome.scm | 2 ++>> 1 file changed, 2 insertions(+)>>>> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm>> index 3f7bbac214..c33653f361 100644>> --- a/gnu/packages/gnome.scm>> +++ b/gnu/packages/gnome.scm>> @@ -8074,6 +8074,8 @@ generic enough to work for everyone.")>> ("openldap" ,openldap)>> ("webkitgtk" ,webkitgtk)>> ("ytnef" ,ytnef)))>> + (propagated-inputs>> + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))>> (home-page "https://gitlab.gnome.org/GNOME/evolution")>> (synopsis "Manage your email, contacts and schedule")>> (description "Evolution is a personal information management application> > Thank you for the patch.> > I’m not sure this is the right thing to do. I don’t think we ever> propagate this package. Instead we often wrap executables so that> relevant environment variables are set. Would this work in the case of> Evolution as well?
The terminator packagage propagates gsetting-desktop-schema as wellhttps://github.com/guix-mirror/guix/blob/8126142baf2cadd7b0052ba7b1d0cd248c8cbc40/gnu/packages/gnome.scm#L8159-L8161
but maybe its also doing the wrong thing? I'll look in to how to wrapthe executable and see if that will work.
T
T
Tobias Geerinckx-Rice wrote on 5 Aug 2019 22:30
87wofr2w3q.fsf@nckx
Martin, Ricardo,
I agree with Ricardo (here and in matters of fonts) that propagation is to be avoided at all reasonable costs, so…
Martin Becze 写道:
Toggle quote (4 lines)> The terminator packagage propagates gsetting-desktop-schema as > well> but maybe its also doing the wrong thing?
…that was a mistake, in retrospect, fixed in 96681d4be101c771fafd4257aca471685119fedd.
You can probably apply that same fix directly to Evolution. There should be no need to propagate anything.
Thanks!
T G-R
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXUiR+QAKCRANsP+IT1VteSbdAQCEW0CX3UDDEUSYR39RObVh0Xhp/npo4ti0s9cmvYhV/wD/fCM6B/V4bnV8r9QRsR8AnqiNbA46E3eVguTmd8RengE==1DfO-----END PGP SIGNATURE-----
M
M
Martin Becze wrote on 17 Aug 2019 16:33
[PATCH] wrapped evolution so that it know where its gsettings are
(address . 36896@debbugs.gnu.org)(name . Martin Becze)(address . mjbecze@riseup.net)
20190817143315.3900-1-mjbecze@riseup.net
--- gnu/packages/gnome.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
Toggle diff (42 lines)diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scmindex d5e46e09c1..1a091de938 100644--- a/gnu/packages/gnome.scm+++ b/gnu/packages/gnome.scm@@ -39,6 +39,7 @@ ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2019 Jonathan Frederickson <jonathan@terracrypt.net>+;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net> ;;; ;;; This file is part of GNU Guix. ;;;@@ -8100,7 +8101,18 @@ generic enough to work for everyone.") "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l")))) (build-system cmake-build-system) (arguments- `(#:configure-flags+ `(+ #:phases+ (modify-phases %standard-phases+ (add-after+ 'install 'wrap-program+ (lambda* (#:key inputs outputs #:allow-other-keys)+ (let ((out (assoc-ref outputs "out")))+ (wrap-program (string-append out "/bin/evolution")+ `("GSETTINGS_SCHEMA_DIR" = (,(string-append out "/share/glib-2.0/schemas/")))+ `("XDG_DATA_DIRS" = (,(getenv "XDG_DATA_DIRS")))))+ #t)))+ #:configure-flags (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged "-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen a release ; in four years and cannot be built.@@ -8113,6 +8125,7 @@ generic enough to work for everyone.") `(("enchant" ,enchant) ("evolution-data-server" ,evolution-data-server) ; must be the same version ("gcr" ,gcr)+ ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gnome-autoar" ,gnome-autoar) ("gnome-desktop" ,gnome-desktop) ("gtkspell3" ,gtkspell3)-- 2.22.0
M
M
Martin Becze wrote on 17 Aug 2019 16:35
(address . 36896@debbugs.gnu.org)(name . Martin Becze)(address . mjbecze@riseup.net)
20190817143559.3975-1-mjbecze@riseup.net
--- gnu/packages/gnome.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
Toggle diff (42 lines)diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scmindex d5e46e09c1..1a091de938 100644--- a/gnu/packages/gnome.scm+++ b/gnu/packages/gnome.scm@@ -39,6 +39,7 @@ ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2019 Jonathan Frederickson <jonathan@terracrypt.net>+;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net> ;;; ;;; This file is part of GNU Guix. ;;;@@ -8100,7 +8101,18 @@ generic enough to work for everyone.") "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l")))) (build-system cmake-build-system) (arguments- `(#:configure-flags+ `(+ #:phases+ (modify-phases %standard-phases+ (add-after+ 'install 'wrap-program+ (lambda* (#:key inputs outputs #:allow-other-keys)+ (let ((out (assoc-ref outputs "out")))+ (wrap-program (string-append out "/bin/evolution")+ `("GSETTINGS_SCHEMA_DIR" = (,(string-append out "/share/glib-2.0/schemas/")))+ `("XDG_DATA_DIRS" = (,(getenv "XDG_DATA_DIRS")))))+ #t)))+ #:configure-flags (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged "-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen a release ; in four years and cannot be built.@@ -8113,6 +8125,7 @@ generic enough to work for everyone.") `(("enchant" ,enchant) ("evolution-data-server" ,evolution-data-server) ; must be the same version ("gcr" ,gcr)+ ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gnome-autoar" ,gnome-autoar) ("gnome-desktop" ,gnome-desktop) ("gtkspell3" ,gtkspell3)-- 2.22.0
M
M
Martin Becze wrote on 20 Aug 2019 15:04
Re: bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs
(name . Tobias Geerinckx-Rice)(address . me@tobias.gr)
8eb7ad0b0ffd12f2fa7dfe11ff9e5444@riseup.net
On 2019-08-05 16:30, Tobias Geerinckx-Rice wrote:
Toggle quote (19 lines)> Martin, Ricardo,> > I agree with Ricardo (here and in matters of fonts) that propagation> is to be avoided at all reasonable costs, so…> > Martin Becze 写道:>> The terminator packagage propagates gsetting-desktop-schema as well>> but maybe its also doing the wrong thing?> > …that was a mistake, in retrospect, fixed in> 96681d4be101c771fafd4257aca471685119fedd.> > You can probably apply that same fix directly to Evolution. There> should be no need to propagate anything.> > Thanks!> > T G-R
bumping! :P I sent a new patch in (using git sendemail) but it didn't thread quitecorrectly.
M
M
Martin Becze wrote on 27 Aug 2019 10:23
(name . Tobias Geerinckx-Rice)(address . me@tobias.gr)
8f037ead0d55cc4f7c357a77ea6e6983@riseup.net
On 2019-08-20 09:04, Martin Becze wrote:
Toggle quote (24 lines)> On 2019-08-05 16:30, Tobias Geerinckx-Rice wrote:>> Martin, Ricardo,>>>> I agree with Ricardo (here and in matters of fonts) that propagation>> is to be avoided at all reasonable costs, so…>>>> Martin Becze 写道:>>> The terminator packagage propagates gsetting-desktop-schema as well>>> but maybe its also doing the wrong thing?>>>> …that was a mistake, in retrospect, fixed in>> 96681d4be101c771fafd4257aca471685119fedd.>>>> You can probably apply that same fix directly to Evolution. There>> should be no need to propagate anything.>>>> Thanks!>>>> T G-R> > bumping! :P > I sent a new patch in (using git sendemail) but it didn't thread quite> correctly.
bumping! I have a few more evolution patches but need to get this one infirst.
M
M
Martin Becze wrote on 3 Sep 2019 17:47
(name . Tobias Geerinckx-Rice)(address . me@tobias.gr)
89bb192a6e60ad7d45d3471270c86e4c@riseup.net
On 2019-08-27 04:23, Martin Becze wrote:
Toggle quote (28 lines)> On 2019-08-20 09:04, Martin Becze wrote:>> On 2019-08-05 16:30, Tobias Geerinckx-Rice wrote:>>> Martin, Ricardo,>>>>>> I agree with Ricardo (here and in matters of fonts) that propagation>>> is to be avoided at all reasonable costs, so…>>>>>> Martin Becze 写道:>>>> The terminator packagage propagates gsetting-desktop-schema as well>>>> but maybe its also doing the wrong thing?>>>>>> …that was a mistake, in retrospect, fixed in>>> 96681d4be101c771fafd4257aca471685119fedd.>>>>>> You can probably apply that same fix directly to Evolution. There>>> should be no need to propagate anything.>>>>>> Thanks!>>>>>> T G-R>>>> bumping! :P>> I sent a new patch in (using git sendemail) but it didn't thread quite>> correctly.> > bumping! I have a few more evolution patches but need to get this one in> first
bumping!
R
R
Ricardo Wurmus wrote on 3 Sep 2019 17:59
(name . Martin Becze)(address . mjbecze@riseup.net)
871rwxgym0.fsf@elephly.net
Hi Martin,
Toggle quote (8 lines)>>> I sent a new patch in (using git sendemail) but it didn't thread quite>>> correctly.>> >> bumping! I have a few more evolution patches but need to get this one in>> first>> bumping!
Sorry for the delay! Where can I find the new patch that you’ve sent?I don’t see it in your previous emails.
-- Ricardo
M
M
Martin Becze wrote on 4 Sep 2019 13:09
(name . Ricardo Wurmus)(address . rekado@elephly.net)
0b7c863c0f42f84c59b2fe97b0c425f5@riseup.net
On 2019-09-03 11:59, Ricardo Wurmus wrote:
Toggle quote (13 lines)> Hi Martin,> >>>> I sent a new patch in (using git sendemail) but it didn't thread quite>>>> correctly.>>>>>> bumping! I have a few more evolution patches but need to get this one in>>> first>>>> bumping!> > Sorry for the delay! Where can I find the new patch that you’ve sent?> I don’t see it in your previous emails.
hmm maybe i did something wrong when sending with "git-sendemail" itshowed up here https://issues.guix.info/issue/36896Anyways here is the patch!
--- gnu/packages/gnome.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
Toggle diff (47 lines)diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scmindex d5e46e09c1..1a091de938 100644--- a/gnu/packages/gnome.scm+++ b/gnu/packages/gnome.scm@@ -39,6 +39,7 @@ ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2019 Jonathan Frederickson <jonathan@terracrypt.net>+;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net> ;;; ;;; This file is part of GNU Guix. ;;;@@ -8100,7 +8101,18 @@ generic enough to work for everyone.") "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l")))) (build-system cmake-build-system) (arguments- `(#:configure-flags+ `(+ #:phases+ (modify-phases %standard-phases+ (add-after+ 'install 'wrap-program+ (lambda* (#:key inputs outputs #:allow-other-keys)+ (let ((out (assoc-ref outputs "out")))+ (wrap-program (string-append out "/bin/evolution")+ `("GSETTINGS_SCHEMA_DIR" = (,(string-append out"/share/glib-2.0/schemas/")))+ `("XDG_DATA_DIRS" = (,(getenv "XDG_DATA_DIRS")))))+ #t)))+ #:configure-flags (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged "-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen arelease ; in four years and cannot bebuilt.@@ -8113,6 +8125,7 @@ generic enough to work for everyone.") `(("enchant" ,enchant) ("evolution-data-server" ,evolution-data-server) ; must be thesame version ("gcr" ,gcr)+ ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gnome-autoar" ,gnome-autoar) ("gnome-desktop" ,gnome-desktop) ("gtkspell3" ,gtkspell3)-- 2.22.0
T
T
Tobias Geerinckx-Rice wrote on 4 Sep 2019 14:17
(name . Martin Becze)(address . mjbecze@riseup.net)
87mufktfvm.fsf@nckx
Martin,
Martin Becze 写道:
Toggle quote (4 lines)> hmm maybe i did something wrong when sending with > "git-sendemail" it> showed up here https://issues.guix.info/issue/36896
Strange… It can't find it in my mailbox either.
Is there a commit message?
Toggle quote (3 lines)> `("GSETTINGS_SCHEMA_DIR" = (,(string-append out> "/share/glib-2.0/schemas/")))
Please wrap long lines like these at 80 characters. I'd do so after ‘=’.
Toggle quote (3 lines)> + `("XDG_DATA_DIRS" = (,(getenv > "XDG_DATA_DIRS")))))
I think this is something we want to append (":" suffix), not override outright (=), no?
Grepping through Guix, I see that ‘prefix’ is popular too, but I'm not sure why. Does that still grant users the same control over the result? (This question for extra credit only :-)
Thanks, and sorry for the wait,
T G-R
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXW+rXQAKCRANsP+IT1VtebvnAP9fl/mBIywH1284ob1C1NOCL7q6by1qe3QwMSc0JxDupAD+JQxJ7A05rae++MioT2ZdCEqspBZ6+0c/cgIgNFrXuww==AHvJ-----END PGP SIGNATURE-----
M
M
Martin Becze wrote on 6 Sep 2019 11:59
(name . Tobias Geerinckx-Rice)(address . me@tobias.gr)
8e0af69e-fad9-733b-a710-dab620922e65@riseup.net
On 9/4/19 2:17 PM, Tobias Geerinckx-Rice wrote:
Toggle quote (29 lines)> Martin,>> Martin Becze 写道:>> hmm maybe i did something wrong when sending with "git-sendemail" it>> showed up here https://issues.guix.info/issue/36896>> Strange…  It can't find it in my mailbox either.>> Is there a commit message?>>> `("GSETTINGS_SCHEMA_DIR" = (,(string-append out>>  "/share/glib-2.0/schemas/")))>> Please wrap long lines like these at 80 characters.  I'd do so after ‘=’.>>> +                `("XDG_DATA_DIRS" = (,(getenv "XDG_DATA_DIRS")))))>> I think this is something we want to append (":" suffix), not override> outright (=), no?>> Grepping through Guix, I see that ‘prefix’ is popular too, but I'm not> sure why.  Does that still grant users the same control over the> result?  (This question for extra credit only :-)>> Thanks, and sorry for the wait,>> T G-R

Prefix appends ${MY_VAR:+:}$MY_VAR to the env var, so that seems nice.
Attachment: signature.asc
T
T
Tobias Geerinckx-Rice wrote on 6 Sep 2019 12:30
(name . Martin Becze)(address . mjbecze@riseup.net)
87o8zxwwby.fsf@nckx
Martin,
Martin Becze 写道:
Toggle quote (3 lines)> Prefix appends ${MY_VAR:+:}$MY_VAR to the env var, so that seems > nice.
Sure, that's what I'd expect, but why is it preferred over keeping any user-defined entries first?
Kind regards,
T G-R
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXXI1UQAKCRANsP+IT1VtefJlAQCPGhYNeZsTMMG60H0f1ei3qcdkaFDwMyG4UyiOWqLqWgD7BZPi1ATURPgmHjHXfLu9Jv7SjEZX9WcO1stgFb2bUQU==FJNU-----END PGP SIGNATURE-----
M
M
Martin Becze wrote on 6 Sep 2019 12:35
[PATCH v2] added prefix to the wrapping of XDG_DATA_DIRS for evolution
(address . 36896@debbugs.gnu.org)(name . Martin Becze)(address . mjbecze@riseup.net)
20190906103534.15170-1-mjbecze@riseup.net
---
gnu/packages/gnome.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
Toggle diff (36 lines)diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scmindex 1a091de938..ef6d78bb5a 100644--- a/gnu/packages/gnome.scm+++ b/gnu/packages/gnome.scm@@ -8105,19 +8105,20 @@ generic enough to work for everyone.") #:phases (modify-phases %standard-phases (add-after- 'install 'wrap-program- (lambda* (#:key inputs outputs #:allow-other-keys)- (let ((out (assoc-ref outputs "out")))- (wrap-program (string-append out "/bin/evolution")- `("GSETTINGS_SCHEMA_DIR" = (,(string-append out "/share/glib-2.0/schemas/")))- `("XDG_DATA_DIRS" = (,(getenv "XDG_DATA_DIRS")))))- #t)))+ 'install 'wrap-program+ (lambda* (#:key inputs outputs #:allow-other-keys)+ (let ((out (assoc-ref outputs "out")))+ (wrap-program (string-append out "/bin/evolution")+ `("XDG_DATA_DIRS" prefix (,(getenv "XDG_DATA_DIRS")))+ `("GSETTINGS_SCHEMA_DIR" =+ (,(string-append out "/share/glib-2.0/schemas/")))))+ #t))) #:configure-flags (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged "-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen a release- ; in four years and cannot be built.+ ; in four years and cannot be built. (native-inputs- `(("glib" ,glib "bin") ; glib-mkenums+ `(("glib" ,glib "bin") ; glib-mkenums ("pkg-config" ,pkg-config) ("intltool" ,intltool) ("itstool" ,itstool)))-- 2.23.0
M
M
Martin Becze wrote on 6 Sep 2019 13:49
Re: bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs
(name . Tobias Geerinckx-Rice)(address . me@tobias.gr)
f5aa471c-2469-55fa-38d0-aab34f302d56@riseup.net
Yeah I don't know. I just used prefix in the latest patch. Let me knowif the other method is preferred.
On 9/6/19 12:30 PM, Tobias Geerinckx-Rice wrote:
Toggle quote (11 lines)> Martin,>> Martin Becze 写道:>> Prefix appends ${MY_VAR:+:}$MY_VAR to the env var, so that seems nice.>> Sure, that's what I'd expect, but why is it preferred over keeping any> user-defined entries first?>> Kind regards,>> T G-R
Attachment: signature.asc
M
M
Martin Becze wrote on 10 Sep 2019 15:05
(name . Tobias Geerinckx-Rice)(address . me@tobias.gr)
35bfc691-74cf-dc3f-c704-15106bf45279@riseup.net
ping :P
Toggle quote (42 lines)> --->> gnu/packages/gnome.scm | 19 ++++++++++---------> 1 file changed, 10 insertions(+), 9 deletions(-)>> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm> index 1a091de938..ef6d78bb5a 100644> --- a/gnu/packages/gnome.scm> +++ b/gnu/packages/gnome.scm> @@ -8105,19 +8105,20 @@ generic enough to work for everyone.")> #:phases> (modify-phases %standard-phases> (add-after> - 'install 'wrap-program> - (lambda* (#:key inputs outputs #:allow-other-keys)> - (let ((out (assoc-ref outputs "out")))> - (wrap-program (string-append out "/bin/evolution")> - `("GSETTINGS_SCHEMA_DIR" = (,(string-append out "/share/glib-2.0/schemas/")))> - `("XDG_DATA_DIRS" = (,(getenv "XDG_DATA_DIRS")))))> - #t)))> + 'install 'wrap-program> + (lambda* (#:key inputs outputs #:allow-other-keys)> + (let ((out (assoc-ref outputs "out")))> + (wrap-program (string-append out "/bin/evolution")> + `("XDG_DATA_DIRS" prefix (,(getenv "XDG_DATA_DIRS")))> + `("GSETTINGS_SCHEMA_DIR" => + (,(string-append out "/share/glib-2.0/schemas/")))))> + #t)))> #:configure-flags> (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged> "-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen a release> - ; in four years and cannot be built.> + ; in four years and cannot be built.> (native-inputs> - `(("glib" ,glib "bin") ; glib-mkenums> + `(("glib" ,glib "bin") ; glib-mkenums> ("pkg-config" ,pkg-config)> ("intltool" ,intltool)> ("itstool" ,itstool)))> -- > 2.23.0
On 9/6/19 1:49 PM, Martin Becze wrote:
Toggle quote (14 lines)> Yeah I don't know. I just used prefix in the latest patch. Let me know> if the other method is preferred.>> On 9/6/19 12:30 PM, Tobias Geerinckx-Rice wrote:>> Martin,>>>> Martin Becze 写道:>>> Prefix appends ${MY_VAR:+:}$MY_VAR to the env var, so that seems nice.>> Sure, that's what I'd expect, but why is it preferred over keeping any>> user-defined entries first?>>>> Kind regards,>>>> T G-R
Attachment: file
Attachment: signature.asc
T
T
Tobias Geerinckx-Rice wrote on 16 Sep 2019 12:26
(name . Martin Becze)(address . mjbecze@riseup.net)(address . 36896-done@debbugs.gnu.org)
87h85c1qqh.fsf@nckx
Martin,
Martin Becze 写道:
Toggle quote (2 lines)> ping :P
Absolutely.
The diff you sent here[0] is incomplete (it relies on your previous patch and doesn't have a header); please always send git-formatted patches that apply directly to current master. They are easier to merge and will be merged sooner.
Toggle quote (4 lines)> Yeah I don't know. I just used prefix in the latest patch. Let > me know> if the other method is preferred.
¯\_(ツ)_/¯
I've pushed this to master as ad6e168b3f29576d92b00725dedbb38cd5f05e46 with the following changes:
- Moved widowed ‘#:phases’ to the previous line (in well-formatted Scheme, ‘(’ can never end a line and ‘)’ should never start one), same for 'phase 'names- then decided to move ’#:phases’ below ‘#:configure-flags’. This is subjective, but since *flags ‘affect’ phases (never the other way 'round) it felt right :-)- dropped the unused ‘inputs’ phase argument- added the missing ":" separator to the prefix wrapping — if it does work without one (I didn't test), that's undocumented & shouldn't be relied upon- removed unnecessary trailing / in ‘schemas/’- and wrote a commit message as mostly documented in ‘info (standards)Change Logs’.
Thanks!
T G-R
[0]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36896#53
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEfo+u0AlEeO9y5k0W2Imw8BjFSTwFAl1/Y2YACgkQ2Imw8BjFSTwCgA//a4I8r4E52kvXZ9uOt+x/kVe+aJ/eLz1xnN1fwQjILOAMy8phq4fM4HAxKxTK4GpaBJx9dlVGl32xHiKtrKAwcIx308SqIpokgKrnm0hTI+H0CXYRBUj5brso3H6qMWLyzx2d9TvRlDynlfaiJHrbRoh2o/u8a9sx7tNS5fZXq968Rlsay4BOC7zW8mSYMK7Ho6OjaOHZ2NVp7ioFgid2xZymQXBPkPYBlsm2mBGQMpR0E4QGuY59HzViYcOPVOu+G8DIsywH+249ZjFAJxwjjHM5AszP5w2LCIhQCLV1PgZblUmLPTpvpzRGOoCZx8cRBoehHKlnoAJA52ECx6FBzkbmGJSNjKTnCWS+3uZu87JD3Li7NyOLMFwN8hekrw9q0C/Ne9CnAYtGVQ2kMjMzzH5IRbj4S2nA19XqBbWmo6ZSNUAWsmH1ch4mx0XD5IO6X+hj1yQT2dnhY208DCQeskBKq01uZtGpYeh8KAPpQlaoiKyMAIeMYCDIrO5W/CKKWcOibt71An8UhdCFNzztt+OrRYqRmZmcuCemmG486E/zjG5Py+k/sm8r6160St1h2/rtZlgvveuvmb9vpSBCAnqo5MSJXCRzKkSJxEY9P+7B6+F+HsiRVJz47NMVmT1aCDPBbZxtvcG2pUq8o+9Sw4CpnC7ea3YaTgsTJw4SFFU==KFsa-----END PGP SIGNATURE-----
Closed
?
Your comment

This issue is archived.

To comment on this conversation send email to 36896@debbugs.gnu.org