* bug#36896: Evolution needs gsettings-desktop-schemas @ 2019-08-01 22:14 Martin Becze 2019-08-02 2:28 ` bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs null ` (2 more replies) 0 siblings, 3 replies; 19+ messages in thread From: Martin Becze @ 2019-08-01 22:14 UTC (permalink / raw) To: 36896 Evolution will crash immediate if gsettings-desktop-schemas is not also installed ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-08-01 22:14 bug#36896: Evolution needs gsettings-desktop-schemas Martin Becze @ 2019-08-02 2:28 ` null 2019-08-05 1:24 ` mjbecze 2019-08-05 11:40 ` Ricardo Wurmus 2019-08-17 14:33 ` bug#36896: [PATCH] wrapped evolution so that it know where its gsettings are Martin Becze 2019-08-17 14:35 ` Martin Becze 2 siblings, 2 replies; 19+ messages in thread From: null @ 2019-08-02 2:28 UTC (permalink / raw) To: 36896 --- 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 -- 2.22.0 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-08-02 2:28 ` bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs null @ 2019-08-05 1:24 ` mjbecze 2019-08-05 11:40 ` Ricardo Wurmus 1 sibling, 0 replies; 19+ messages in thread From: mjbecze @ 2019-08-05 1:24 UTC (permalink / raw) To: 36896 On 2019-08-01 22:28, null wrote: > --- > 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 :) ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-08-02 2:28 ` bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs null 2019-08-05 1:24 ` mjbecze @ 2019-08-05 11:40 ` Ricardo Wurmus 2019-08-05 19:17 ` Martin Becze 1 sibling, 1 reply; 19+ messages in thread From: Ricardo Wurmus @ 2019-08-05 11:40 UTC (permalink / raw) To: null; +Cc: 36896 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? -- Ricardo ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-08-05 11:40 ` Ricardo Wurmus @ 2019-08-05 19:17 ` Martin Becze 2019-08-05 20:30 ` Tobias Geerinckx-Rice 0 siblings, 1 reply; 19+ messages in thread From: Martin Becze @ 2019-08-05 19:17 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: 36896 On 2019-08-05 07:40, Ricardo Wurmus wrote: > 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 well https://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 wrap the executable and see if that will work. ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-08-05 19:17 ` Martin Becze @ 2019-08-05 20:30 ` Tobias Geerinckx-Rice 2019-08-20 13:04 ` Martin Becze 0 siblings, 1 reply; 19+ messages in thread From: Tobias Geerinckx-Rice @ 2019-08-05 20:30 UTC (permalink / raw) To: 36896, Martin Becze, Ricardo Wurmus [-- Attachment #1: Type: text/plain, Size: 515 bytes --] 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 227 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-08-05 20:30 ` Tobias Geerinckx-Rice @ 2019-08-20 13:04 ` Martin Becze 2019-08-27 8:23 ` Martin Becze 0 siblings, 1 reply; 19+ messages in thread From: Martin Becze @ 2019-08-20 13:04 UTC (permalink / raw) To: Tobias Geerinckx-Rice; +Cc: 36896 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. ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-08-20 13:04 ` Martin Becze @ 2019-08-27 8:23 ` Martin Becze 2019-09-03 15:47 ` Martin Becze 0 siblings, 1 reply; 19+ messages in thread From: Martin Becze @ 2019-08-27 8:23 UTC (permalink / raw) To: Tobias Geerinckx-Rice; +Cc: 36896 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. ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-08-27 8:23 ` Martin Becze @ 2019-09-03 15:47 ` Martin Becze 2019-09-03 15:59 ` Ricardo Wurmus 0 siblings, 1 reply; 19+ messages in thread From: Martin Becze @ 2019-09-03 15:47 UTC (permalink / raw) To: Tobias Geerinckx-Rice; +Cc: 36896 On 2019-08-27 04:23, Martin Becze wrote: > 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! ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-09-03 15:47 ` Martin Becze @ 2019-09-03 15:59 ` Ricardo Wurmus 2019-09-04 11:09 ` Martin Becze 0 siblings, 1 reply; 19+ messages in thread From: Ricardo Wurmus @ 2019-09-03 15:59 UTC (permalink / raw) To: Martin Becze; +Cc: 36896 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. -- Ricardo ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-09-03 15:59 ` Ricardo Wurmus @ 2019-09-04 11:09 ` Martin Becze 2019-09-04 12:17 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix 0 siblings, 1 reply; 19+ messages in thread From: Martin Becze @ 2019-09-04 11:09 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: 36896 On 2019-09-03 11:59, Ricardo Wurmus wrote: > 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" it showed up here https://issues.guix.info/issue/36896 Anyways here is the patch! --- gnu/packages/gnome.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 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 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-09-04 11:09 ` Martin Becze @ 2019-09-04 12:17 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix 2019-09-06 9:59 ` Martin Becze 0 siblings, 1 reply; 19+ messages in thread From: Tobias Geerinckx-Rice via Bug reports for GNU Guix @ 2019-09-04 12:17 UTC (permalink / raw) To: Martin Becze; +Cc: 36896 [-- Attachment #1: Type: text/plain, Size: 832 bytes --] 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 227 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-09-04 12:17 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix @ 2019-09-06 9:59 ` Martin Becze 2019-09-06 10:30 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix 0 siblings, 1 reply; 19+ messages in thread From: Martin Becze @ 2019-09-06 9:59 UTC (permalink / raw) To: Tobias Geerinckx-Rice; +Cc: 36896 [-- Attachment #1.1: Type: text/plain, Size: 1009 bytes --] On 9/4/19 2:17 PM, Tobias Geerinckx-Rice wrote: > 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 #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-09-06 9:59 ` Martin Becze @ 2019-09-06 10:30 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix 2019-09-06 11:49 ` Martin Becze 0 siblings, 1 reply; 19+ messages in thread From: Tobias Geerinckx-Rice via Bug reports for GNU Guix @ 2019-09-06 10:30 UTC (permalink / raw) To: Martin Becze; +Cc: 36896 [-- Attachment #1: Type: text/plain, Size: 243 bytes --] 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 #2: signature.asc --] [-- Type: application/pgp-signature, Size: 227 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-09-06 10:30 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix @ 2019-09-06 11:49 ` Martin Becze 2019-09-10 13:05 ` Martin Becze 0 siblings, 1 reply; 19+ messages in thread From: Martin Becze @ 2019-09-06 11:49 UTC (permalink / raw) To: Tobias Geerinckx-Rice; +Cc: 36896 [-- Attachment #1.1: Type: text/plain, Size: 416 bytes --] 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 #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-09-06 11:49 ` Martin Becze @ 2019-09-10 13:05 ` Martin Becze 2019-09-16 10:26 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix 0 siblings, 1 reply; 19+ messages in thread From: Martin Becze @ 2019-09-10 13:05 UTC (permalink / raw) To: Tobias Geerinckx-Rice; +Cc: 36896 [-- Attachment #1.1.1: Type: text/plain, Size: 2398 bytes --] ping :P > --- > > 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: > 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 #1.1.2: Type: text/html, Size: 3477 bytes --] [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 2019-09-10 13:05 ` Martin Becze @ 2019-09-16 10:26 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix 0 siblings, 0 replies; 19+ messages in thread From: Tobias Geerinckx-Rice via Bug reports for GNU Guix @ 2019-09-16 10:26 UTC (permalink / raw) To: Martin Becze; +Cc: 36896-done [-- Attachment #1: Type: text/plain, Size: 1348 bytes --] Martin, Martin Becze 写道: > 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. > 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 832 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] wrapped evolution so that it know where its gsettings are 2019-08-01 22:14 bug#36896: Evolution needs gsettings-desktop-schemas Martin Becze 2019-08-02 2:28 ` bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs null @ 2019-08-17 14:33 ` Martin Becze 2019-08-17 14:35 ` Martin Becze 2 siblings, 0 replies; 19+ messages in thread From: Martin Becze @ 2019-08-17 14:33 UTC (permalink / raw) To: 36896 --- gnu/packages/gnome.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 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 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* bug#36896: [PATCH] wrapped evolution so that it know where its gsettings are 2019-08-01 22:14 bug#36896: Evolution needs gsettings-desktop-schemas Martin Becze 2019-08-02 2:28 ` bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs null 2019-08-17 14:33 ` bug#36896: [PATCH] wrapped evolution so that it know where its gsettings are Martin Becze @ 2019-08-17 14:35 ` Martin Becze 2 siblings, 0 replies; 19+ messages in thread From: Martin Becze @ 2019-08-17 14:35 UTC (permalink / raw) To: 36896 --- gnu/packages/gnome.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 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 ^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2019-09-16 10:27 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-08-01 22:14 bug#36896: Evolution needs gsettings-desktop-schemas Martin Becze 2019-08-02 2:28 ` bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs null 2019-08-05 1:24 ` mjbecze 2019-08-05 11:40 ` Ricardo Wurmus 2019-08-05 19:17 ` Martin Becze 2019-08-05 20:30 ` Tobias Geerinckx-Rice 2019-08-20 13:04 ` Martin Becze 2019-08-27 8:23 ` Martin Becze 2019-09-03 15:47 ` Martin Becze 2019-09-03 15:59 ` Ricardo Wurmus 2019-09-04 11:09 ` Martin Becze 2019-09-04 12:17 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix 2019-09-06 9:59 ` Martin Becze 2019-09-06 10:30 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix 2019-09-06 11:49 ` Martin Becze 2019-09-10 13:05 ` Martin Becze 2019-09-16 10:26 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix 2019-08-17 14:33 ` bug#36896: [PATCH] wrapped evolution so that it know where its gsettings are Martin Becze 2019-08-17 14:35 ` Martin Becze
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).