diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index bba9461d44..1c0de6eaed 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -181,6 +181,7 @@ shared NFS home directories.") (package (name "glib") (version "2.62.6") + (replacement glib-with-gio-patch) (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -387,6 +388,14 @@ dynamic loading, and an object system.") (home-page "https://developer.gnome.org/glib/") (license license:lgpl2.1+))) +(define glib-with-gio-patch + (package + (inherit glib) + (source (origin + (inherit (package-source glib)) + (patches (append (search-patches "glib-appinfo-watch.patch") + (origin-patches (package-source glib)))))))) + (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gtk-doc, ;; which in turn depends on glib. diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index 716b9feb8d..4797111c67 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -4,7 +4,7 @@ (use-modules (gnu) (gnu system nss)) (use-service-modules desktop xorg) -(use-package-modules certs gnome) +(use-package-modules certs gnome linux) (operating-system (host-name "antelope") @@ -57,7 +57,8 @@ ;; for HTTPS access nss-certs ;; for user mounts - gvfs) + gvfs + strace) %base-packages)) ;; Add GNOME and Xfce---we can choose at the log-in screen @@ -65,7 +66,6 @@ ;; include the X11 log-in service, networking with ;; NetworkManager, and more. (services (append (list (service gnome-desktop-service-type) - (service xfce-desktop-service-type) (set-xorg-configuration (xorg-configuration (keyboard-layout keyboard-layout))))