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: Tue, 10 Sep 2019 15:05:53 +0200 Message-ID: <35bfc691-74cf-dc3f-c704-15106bf45279@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> <0b7c863c0f42f84c59b2fe97b0c425f5@riseup.net> <87mufktfvm.fsf@nckx> <8e0af69e-fad9-733b-a710-dab620922e65@riseup.net> <87o8zxwwby.fsf@nckx> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="IAwd73eppP3gFTwYWZO0ojo7UNjBeRyqS" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:36000) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7frM-0005cR-1m for bug-guix@gnu.org; Tue, 10 Sep 2019 09:07:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7frK-0002JJ-Rs for bug-guix@gnu.org; Tue, 10 Sep 2019 09:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60454) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7frK-0002Iw-J7 for bug-guix@gnu.org; Tue, 10 Sep 2019 09:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i7frK-0005Fv-Ah for bug-guix@gnu.org; Tue, 10 Sep 2019 09:07:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: 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: Tobias Geerinckx-Rice Cc: 36896@debbugs.gnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --IAwd73eppP3gFTwYWZO0ojo7UNjBeRyqS Content-Type: multipart/mixed; boundary="I5ZczDdU6LUdOZLnVSJUS9pVzYtEljwhU"; protected-headers="v1" From: Martin Becze To: Tobias Geerinckx-Rice Cc: Ricardo Wurmus , 36896@debbugs.gnu.org Message-ID: <35bfc691-74cf-dc3f-c704-15106bf45279@riseup.net> Subject: Re: bug#36896: [PATCH] added gsettings-desktop-schema to progragated inputs 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> <0b7c863c0f42f84c59b2fe97b0c425f5@riseup.net> <87mufktfvm.fsf@nckx> <8e0af69e-fad9-733b-a710-dab620922e65@riseup.net> <87o8zxwwby.fsf@nckx> In-Reply-To: --I5ZczDdU6LUdOZLnVSJUS9pVzYtEljwhU Content-Type: multipart/alternative; boundary="------------24AA5AB2D8A3D3C682CCE891" Content-Language: en-US This is a multi-part message in MIME format. --------------24AA5AB2D8A3D3C682CCE891 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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" =3D (,(string-append out "/sh= are/glib-2.0/schemas/"))) > - `("XDG_DATA_DIRS" =3D (,(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" =3D > + (,(string-append out "/share/glib-2.0/schemas/"))))= ) > + #t))) > #:configure-flags > (list "-DENABLE_PST_IMPORT=3DOFF" ; libpst is not packaged > "-DENABLE_LIBCRYPTUI=3DOFF"))) ; libcryptui hasn't seen a= release > - ; in four years and cannot b= e 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))) > --=20 > 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 =E5=86=99=E9=81=93=EF=BC=9A >>> Prefix appends ${MY_VAR:+:}$MY_VAR to the env var, so that seems nice= =2E >> Sure, that's what I'd expect, but why is it preferred over keeping any= >> user-defined entries first? >> >> Kind regards, >> >> T G-R --------------24AA5AB2D8A3D3C682CCE891 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable

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" =3D (,(string-append out "/shar=
e/glib-2.0/schemas/")))
-                `("XDG_DATA_DIRS" =3D (,(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" =3D
+                   (,(string-append out "/share/glib-2.0/schemas/")))))
+             #t)))
        #:configure-flags
        (list "-DENABLE_PST_IMPORT=3DOFF"    ; libpst is not packaged
              "-DENABLE_LIBCRYPTUI=3DOFF"))) ; libcryptui hasn't seen a r=
elease
-                                          ; in four years and cannot be =
built.
+                                        ; in four years and cannot be bu=
ilt.
     (native-inputs
-     `(("glib" ,glib "bin")               ; glib-mkenums
+     `(("glib" ,glib "bin")             ; glib-mkenums
        ("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
        ("itstool" ,itstool)))
--=20
2.23.0

On 9/6/19 1:49 PM, Martin Becze wrote:= 
Yeah I don't know. I just us=
ed 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 =E5=86=99=E9=81=93=EF=BC=9A

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


    

  


--------------24AA5AB2D8A3D3C682CCE891--

--I5ZczDdU6LUdOZLnVSJUS9pVzYtEljwhU--

--IAwd73eppP3gFTwYWZO0ojo7UNjBeRyqS
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEE8+//NTq9LY27wNqxMhqbCzY7PZcFAl13n7cACgkQMhqbCzY7
PZfzAAf/bzPHcMVv6KkMSP275lcqrkWLj93LZN5NFEuR+H/YBvQ9J5i5u1klTC0b
SgHmi2RV3ssSN8e6hZSUlAzrGIsI6cd2SfIHGj4NUYdHexoDOJtoU6O9M+CQwFgm
TbpLP4nT0wb6t4PBb82XYGtDcarAgEuLzMXKvmhy1IIkzwWKZiIC70doMtt3nSz5
jUFol0Vj5cNB0R30fvd8eF7y5VYRvuSnydKLNmWZS2f29xaLc/JmfLHVMrxvY5CE
Wr0heXCLeFhp7RJ04HlePlOM8hH+NRRe6fdWUWwpYCXV+XFNVTtQeMJz9jv63lLc
8HWdlBNtMtl/reHm4qJzl6uV/GwPnQ==
=ma01
-----END PGP SIGNATURE-----

--IAwd73eppP3gFTwYWZO0ojo7UNjBeRyqS--