From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:36882) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ir7bz-0003EX-B6 for guix-patches@gnu.org; Mon, 13 Jan 2020 16:51:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ir7by-00032N-08 for guix-patches@gnu.org; Mon, 13 Jan 2020 16:51:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54281) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ir7bx-00031w-Sh for guix-patches@gnu.org; Mon, 13 Jan 2020 16:51:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ir7bx-0002wU-QF for guix-patches@gnu.org; Mon, 13 Jan 2020 16:51:01 -0500 Subject: [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type. Resent-Message-ID: From: Marius Bakke In-Reply-To: <20200106193751.725-1-dannym@scratchpost.org> References: <20200106193751.725-1-dannym@scratchpost.org> Date: Mon, 13 Jan 2020 22:50:24 +0100 Message-ID: <87d0bnvxen.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Danny Milosavljevic , 38994@debbugs.gnu.org --=-=-= Content-Type: text/plain Danny Milosavljevic writes: > Fixes . > Reported by Reza Alizadeh Majd . > > * gnu/packages/glib.scm (glib)[arguments]<#:phases>[patch-gio-launch-desktop]: > New phase. > [move-executables]: Modify. > --- > gnu/packages/glib.scm | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index 369bd373ac..9551509a53 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -213,6 +213,15 @@ shared NFS home directories.") > (string-append "command_line = g_strdup_printf (\"" > dbus "/bin/dbus-launch"))) > #t))) > + (add-after 'unpack 'patch-gio-launch-desktop > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((out (assoc-ref outputs "out"))) > + ;; See also > + ;; for another future fix. > + (substitute* "gio/gdesktopappinfo.c" > + (("gio-launch-desktop") > + (string-append out "/bin/gio-launch-desktop"))) > + #t))) > (add-before 'build 'pre-build > (lambda* (#:key inputs outputs #:allow-other-keys) > ;; For tests/gdatetime.c. > @@ -321,6 +330,13 @@ shared NFS home directories.") > (mkdir-p bin) > (rename-file (string-append out "/bin") > (string-append bin "/bin")) > + ;; This one is an implementation detail of glib. > + ;; It is wrong that that's in "/bin" in the first place, > + ;; but that's what upstream does right now. > + ;; See . > + (mkdir (string-append out "/bin")) > + (rename-file (string-append bin "/bin/gio-launch-desktop") > + (string-append out "/bin/gio-launch-desktop")) It is moved to "out" to avoid a circular reference between "bin" and "out", right? IMO we might as well "beat upstream to it" here and use $out/libexec, since nothing else is supposed to depend on it. LGTM with that change. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl4c5iAACgkQoqBt8qM6 VPpsUAgAkzdU3OUI2uEXiLDkmR2AF16aTlJvrj/uuMjVr339WY5iHko2LrC7cBkU O/bOrdJAphS0KSQJzrcSMxIiOFVcwLucSX88/qmqA3aVTOhgle7W2eWnPzP3sVly 6w5Zv/6+FUpz7M0Oe348dhPXIBb6FmIk35gKFyJgodFmeTF2r5GkbixCsurkbHiw mXo3FhjXWwELji3hO/Ry4u89/9amzYNBzipiM+8ybqwgF87yHnhihzKUl9IQ+/qw SdeFCtTUBOk/IXEEWN0cG8p4RoJ5Nop5GqgpUH/Ls62dNGiJZwlzEy3tnimc+spx Ut4ORou+kpt7XpYS84s8Gwb+Hj51Ug== =wGgr -----END PGP SIGNATURE----- --=-=-=--