From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Becze Subject: bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs Date: Wed, 04 Sep 2019 04:09:39 -0700 Message-ID: <0b7c863c0f42f84c59b2fe97b0c425f5@riseup.net> References: <18ecfb89-c1e7-3985-06d1-24a9abe0ecb7@riseup.net> <20190802022815.13670-1-mjbecze@riseup.net> <87sgqfzvpi.fsf@elephly.net> <87wofr2w3q.fsf@nckx> <8eb7ad0b0ffd12f2fa7dfe11ff9e5444@riseup.net> <8f037ead0d55cc4f7c357a77ea6e6983@riseup.net> <89bb192a6e60ad7d45d3471270c86e4c@riseup.net> <871rwxgym0.fsf@elephly.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:34510) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5TAp-0005S2-EZ for bug-guix@gnu.org; Wed, 04 Sep 2019 07:10:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5TAo-00086X-4l for bug-guix@gnu.org; Wed, 04 Sep 2019 07:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5TAn-00086J-Sx for bug-guix@gnu.org; Wed, 04 Sep 2019 07:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i5TAn-0000hT-Mh for bug-guix@gnu.org; Wed, 04 Sep 2019 07:10:01 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <871rwxgym0.fsf@elephly.net> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Ricardo Wurmus Cc: 36896@debbugs.gnu.org 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 ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Jonathan Frederickson +;;; Copyright © 2019 Martin Becze ;;; ;;; 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