From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Becze Subject: bug#36896: [PATCH v2] added prefix to the wrapping of XDG_DATA_DIRS for evolution Date: Fri, 6 Sep 2019 06:35:34 -0400 Message-ID: <20190906103534.15170-1-mjbecze@riseup.net> References: <87mufktfv.fsf@nckx> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:51611) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i6Bb1-0004NS-5A for bug-guix@gnu.org; Fri, 06 Sep 2019 06:36:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i6Bb0-0004n4-5V for bug-guix@gnu.org; Fri, 06 Sep 2019 06:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55899) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i6Baz-0004mz-TT for bug-guix@gnu.org; Fri, 06 Sep 2019 06:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i6Baz-0000eq-Nr for bug-guix@gnu.org; Fri, 06 Sep 2019 06:36:01 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <87mufktfv.fsf@nckx> 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: 36896@debbugs.gnu.org --- 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