From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:58347) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1httOH-0002Gr-G6 for guix-patches@gnu.org; Sat, 03 Aug 2019 08:44:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1httOF-0002pz-Gg for guix-patches@gnu.org; Sat, 03 Aug 2019 08:44:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49657) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1httOE-0002pd-8S for guix-patches@gnu.org; Sat, 03 Aug 2019 08:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1httOE-0005MM-4o for guix-patches@gnu.org; Sat, 03 Aug 2019 08:44:02 -0400 Subject: [bug#36905] [PATCH] gnu: gnome-control-center: Fix info-overview panel issues. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:58270) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1httNR-000283-B6 for guix-patches@gnu.org; Sat, 03 Aug 2019 08:43:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1httNQ-0002gS-Cj for guix-patches@gnu.org; Sat, 03 Aug 2019 08:43:13 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52719) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1httNP-0002fk-QO for guix-patches@gnu.org; Sat, 03 Aug 2019 08:43:12 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 58EAD2400FC for ; Sat, 3 Aug 2019 14:43:09 +0200 (CEST) From: Kei Kebreau Date: Sat, 3 Aug 2019 08:43:01 -0400 Message-Id: <20190803124301.14920-1-kkebreau@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: 36905@debbugs.gnu.org Cc: Kei Kebreau GNOME Control Center should now display the correct GNOME version and gra= phics 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(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3f7bbac214..72b88c73c3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5915,7 +5915,10 @@ devices using the GNOME desktop.") (arguments '(#:glib-or-gtk? #t #:configure-flags - (list "-Dcheese=3Dfalse") + (list "-Dcheese=3Dfalse" + (string-append "-Dgnome_session_libexecdir=3D" + (assoc-ref %build-inputs "gnome-session") + "/libexec")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-paths @@ -5923,7 +5926,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-apple= t"))) + (nm-applet (assoc-ref inputs "network-manager-apple= t")) + (gnome-desktop (assoc-ref inputs "gnome-desktop"))) (substitute* "panels/datetime/tz.h" (("/usr/share/zoneinfo/zone.tab") (string-append tzdata "/share/zoneinfo/zone.tab"))) @@ -5943,6 +5947,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. @@ -5962,6 +5970,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) --=20 2.22.0