me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Kei Kebreau 2019-07-19 16:15:09 -04:00
parent 5485148c76
commit 64c70430ec
No known key found for this signature in database
GPG Key ID: E6A5EE3C19467A0D
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/gnome.scm
View File

@ -5967,7 +5967,10 @@ devices using the GNOME desktop.")
(arguments (arguments
'(#:glib-or-gtk? #t '(#:glib-or-gtk? #t
#:configure-flags #:configure-flags
(list "-Dcheese=false") (list "-Dcheese=false"
(string-append "-Dgnome_session_libexecdir="
(assoc-ref %build-inputs "gnome-session")
"/libexec"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-paths (add-before 'configure 'patch-paths
@ -5975,7 +5978,8 @@ devices using the GNOME desktop.")
(let ((libc (assoc-ref inputs "libc")) (let ((libc (assoc-ref inputs "libc"))
(tzdata (assoc-ref inputs "tzdata")) (tzdata (assoc-ref inputs "tzdata"))
(libgnomekbd (assoc-ref inputs "libgnomekbd")) (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" (substitute* "panels/datetime/tz.h"
(("/usr/share/zoneinfo/zone.tab") (("/usr/share/zoneinfo/zone.tab")
(string-append tzdata "/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") (substitute* '("panels/user-accounts/run-passwd.c")
(("/usr/bin/passwd") (("/usr/bin/passwd")
"/run/setuid-programs/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)))))) #t))))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
@ -6014,6 +6022,7 @@ devices using the GNOME desktop.")
("gnome-desktop" ,gnome-desktop) ("gnome-desktop" ,gnome-desktop)
("gnome-online-accounts" ,gnome-online-accounts) ("gnome-online-accounts" ,gnome-online-accounts)
("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
("gnome-session" ,gnome-session)
("gnome-settings-daemon" ,gnome-settings-daemon) ("gnome-settings-daemon" ,gnome-settings-daemon)
("grilo" ,grilo) ("grilo" ,grilo)
("ibus" ,ibus) ("ibus" ,ibus)