This reverts commit 2007a5b2, which broke installation of the package. See: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1579. diff --git a/meson.build b/meson.build index 734810d01..b4a45c60d 100644 --- a/meson.build +++ b/meson.build @@ -259,6 +259,13 @@ config_h.set('HAVE_WACOM', host_is_linux_not_s390, config_h.set('BUILD_THUNDERBOLT', host_is_linux_not_s390, description: 'Define to 1 to build the Thunderbolt panel') +# Check for info panel +gnome_session_libexecdir = get_option('gnome_session_libexecdir') +if gnome_session_libexecdir == '' + gnome_session_libexecdir = control_center_libexecdir +endif + + gnome = import('gnome') i18n = import('i18n') pkg = import('pkgconfig') diff --git a/meson_options.txt b/meson_options.txt index 1b7b54810..910226c56 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,6 @@ option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support') option('documentation', type: 'boolean', value: false, description: 'build documentation') +option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir') option('ibus', type: 'boolean', value: true, description: 'build with IBus support') option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') option('snap', type: 'boolean', value: false, description: 'build with Snap support') diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c index 6e832eb35..b34030c8c 100644 --- a/panels/info-overview/cc-info-overview-panel.c +++ b/panels/info-overview/cc-info-overview-panel.c @@ -236,7 +236,7 @@ static char * get_renderer_from_helper (const char **env) { int status; - char *argv[] = { LIBEXECDIR "/gnome-control-center-print-renderer", NULL }; + char *argv[] = { GNOME_SESSION_DIR "/gnome-session-check-accelerated", NULL }; g_auto(GStrv) envp = NULL; g_autofree char *renderer = NULL; g_autoptr(GError) error = NULL; diff --git a/panels/info-overview/meson.build b/panels/info-overview/meson.build index 2fe10b32c..506b7274e 100644 --- a/panels/info-overview/meson.build +++ b/panels/info-overview/meson.build @@ -19,7 +19,7 @@ i18n.merge_file( cflags += [ '-DDATADIR="@0@"'.format(control_center_datadir), - '-DLIBEXECDIR="@0@"'.format(control_center_libexecdir), + '-DGNOME_SESSION_DIR="@0@"'.format(gnome_session_libexecdir) ] sources = files( 09bb9c12598f287a5a586a93a8cf&showmsg=1'>Expand)Author 2019-06-12services: Import (srfi srfi-26) from the build side....See <https://lists.gnu.org/archive/html/guix-devel/2019-06/msg00119.html>. * gnu/services/nix.scm (nix-activation): Remove (srfi srfi-26) from (host-) imported modules. Tobias Geerinckx-Rice 2019-06-11services: Add SRFI-26 to Nix activation gexp....Fix the following fatal error on ‘guix system reconfigure’: Backtrace: 18 (primitive-load "/home/nckx/.config/guix/current/bin/guix") In guix/ui.scm: 1620:12 17 (run-guix-command _ . _) In ice-9/boot-9.scm: 829:9 16 (catch _ _ #<procedure 7a7caa2d4c80 at guix/ui.scm:587:2 (key c)> _) 829:9 15 (catch _ _ #<procedure 7a7caa2d4c98 at guix/ui.scm:710:6 (key proc format-string format-args . …> …) In guix/scripts/system.scm: 1325:8 14 (_) In guix/status.scm: 768:4 13 (call-with-status-report _ _) In guix/scripts/system.scm: 1181:4 12 (process-action _ _ _) In guix/store.scm: 623:10 11 (call-with-store _) 1800:24 10 (run-with-store _ _ #:guile-for-build _ #:system _ #:target _) In guix/scripts/system.scm: 920:13 9 (_ _) 409:8 8 (_ _) In unknown file: 7 (primitive-load "/gnu/store/dha7j9gcz3vgb8cy7vfvvaswwsywrrzj-activate") In ice-9/boot-9.scm: 260:13 6 (for-each #<procedure primitive-load (_)> _) In unknown file: 5 (primitive-load "/gnu/store/ql1xjxrssxm51z2bn2v6l3mlrncij84h-activate-service") In ice-9/eval.scm: 619:8 4 (_ #f) 196:35 3 (_ #f) 196:27 2 (_ #f) 223:20 1 (proc #<directory (guile-user) 1fa4140>) In unknown file: 0 (%resolve-variable (7 . cut) #<directory (guile-user) 1fa4140>) ERROR: In procedure %resolve-variable: error: cut: unbound variable Reported-by: Alex McGrath on #guix. * gnu/services/nix.scm (nix-activation): Import and use (srfi srfi-26). Tobias Geerinckx-Rice 2019-06-10services: Add 'nix-service-type'....* gnu/services/nix.scm: New file. * gnu/local.mk: Add this. * doc/guix.texi (Miscellaneous Services): Document this. Oleg Pykhalov