From 64c70430ec80c93faff6139fdb9d3de92704b81e Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kkebreau@posteo.net>
Date: Fri, 19 Jul 2019 16:15:09 -0400
Subject: gnu: gnome-control-center: Fix info-overview panel issues.

GNOME Control Center should now display the correct GNOME version and graphics
information in the "Details > About" panel.

* gnu/packages/gnome.scm (gnome-control-center)[arguments]: Add configure
flag.  Adjust 'patch-paths' phase accordingly.
[inputs]: Add gnome-session.
---
 gnu/packages/gnome.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d5e46e09c1..bfc055eed4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5967,7 +5967,10 @@ devices using the GNOME desktop.")
     (arguments
      '(#:glib-or-gtk? #t
        #:configure-flags
-       (list "-Dcheese=false")
+       (list "-Dcheese=false"
+             (string-append "-Dgnome_session_libexecdir="
+                            (assoc-ref %build-inputs "gnome-session")
+                            "/libexec"))
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'patch-paths
@@ -5975,7 +5978,8 @@ devices using the GNOME desktop.")
              (let ((libc   (assoc-ref inputs "libc"))
                    (tzdata (assoc-ref inputs "tzdata"))
                    (libgnomekbd (assoc-ref inputs "libgnomekbd"))
-                   (nm-applet   (assoc-ref inputs "network-manager-applet")))
+                   (nm-applet   (assoc-ref inputs "network-manager-applet"))
+                   (gnome-desktop (assoc-ref inputs "gnome-desktop")))
                (substitute* "panels/datetime/tz.h"
                  (("/usr/share/zoneinfo/zone.tab")
                   (string-append tzdata "/share/zoneinfo/zone.tab")))
@@ -5995,6 +5999,10 @@ devices using the GNOME desktop.")
                (substitute* '("panels/user-accounts/run-passwd.c")
                  (("/usr/bin/passwd")
                   "/run/setuid-programs/passwd"))
+               (substitute* "panels/info/cc-info-overview-panel.c"
+                 (("DATADIR \"/gnome/gnome-version.xml\"")
+                  (string-append "\"" gnome-desktop
+                                 "/share/gnome/gnome-version.xml\"")))
                #t))))))
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
@@ -6014,6 +6022,7 @@ devices using the GNOME desktop.")
        ("gnome-desktop" ,gnome-desktop)
        ("gnome-online-accounts" ,gnome-online-accounts)
        ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
+       ("gnome-session" ,gnome-session)
        ("gnome-settings-daemon" ,gnome-settings-daemon)
        ("grilo" ,grilo)
        ("ibus" ,ibus)
-- 
cgit v1.2.3

Add 'reconfigure' module.</a><span class='msg-avail'>...</span></td><td>Jakob L. Kreuze</td></tr>
<tr><td><span title='2019-01-24 20:47:21 +0100'>2019-01-24</span></td><td><a href='/guix/commit/tests/services.scm?id=2c5ee9bba4067fb0a9e68fb2af3a6e7fe36960cb'>tests: Remove duplicate field initializers.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>