From c08c543208832c155ed0914de9429cea0022db8f Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 14 Sep 2020 23:00:34 +0200 Subject: gnu: gnome-shell: Fix startup. * gnu/packages/gnome.scm (gnome-shell)[inputs]: Add libnma, upower. [arguments]<#:phases>[patch-install-paths]: Use standard GI repository installation directory. --- gnu/packages/gnome.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8842b78e4e..1dc457058a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9880,7 +9880,7 @@ (define-public gnome-shell (("install_dir_gir: pkgdatadir,") "install_dir_gir: join_paths(pkgdatadir, 'gir-1.0'),") (("install_dir_typelib: pkglibdir,") - "install_dir_typelib: join_paths(pkglibdir, 'girepository-1.0'),")) + "install_dir_typelib: join_paths(get_option('libdir'), 'girepository-1.0'),")) (substitute* "subprojects/extensions-tool/meson.build" (("bash_completion\\.get_pkgconfig_variable\\('completionsdir'\\)") (string-append "'" @@ -9973,7 +9973,13 @@ (define-public gnome-shell ("mutter" ,mutter) ("pango" ,pango) ("polkit-agent" ,polkit) - ("x11" ,libx11))) + ("x11" ,libx11) + + ;;; TODO: Add ibus-daemon somehow. + + ;; The Javascript files need those: + ("libnma" ,libnma) + ("upower" ,upower))) (synopsis "Next generation desktop shell") (description "GNOME-Shell provides core user interface functions for the GNOME desktop, like switching to windows and launching applications. It takes -- cgit v1.2.3