--- Begin Message ---
Subject: |
[PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type. |
Date: |
Mon, 6 Jan 2020 20:37:51 +0100 |
Fixes <https://bugs.gnu.org/38524>.
Reported by Reza Alizadeh Majd <address@hidden>.
* 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 <https://gitlab.gnome.org/GNOME/glib/issues/1633>
+ ;; 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 <https://gitlab.gnome.org/GNOME/glib/issues/1633>.
+ (mkdir (string-append out "/bin"))
+ (rename-file (string-append bin "/bin/gio-launch-desktop")
+ (string-append out "/bin/gio-launch-desktop"))
;; Do not refer to "bindir", which points to "${prefix}/bin".
;; We don't patch "bindir" to point to "$bin/bin", because that
;; would create a reference cycle between the "out" and "bin"
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type. |
Date: |
Tue, 14 Jan 2020 01:59:38 +0100 |
Hi Marius,
On Mon, 13 Jan 2020 22:50:24 +0100
Marius Bakke <address@hidden> wrote:
> It is moved to "out" to avoid a circular reference between "bin" and
> "out", right?
Yes.
>IMO we might as well "beat upstream to it" here and use
> $out/libexec, since nothing else is supposed to depend on it.
Okay.
Pushed to guix core-updates as commit 0bcc1b14fc3e2382406b97577c56e2292b96b8d4.
pgpwLCiQw5s8_.pgp
Description: OpenPGP digital signature
--- End Message ---