summary refs log tree commit diff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2020-09-14 23:00:34 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2020-09-15 01:47:06 +0200
commitc08c543208832c155ed0914de9429cea0022db8f (patch)
treea045cbecfd69eca97ee15761882f64b2db82b0ff
parent2fa04cae1c03858f345da06e226cecb801f130bf (diff)
downloadguix-wip-desktop.tar.gz
gnu: gnome-shell: Fix startup. wip-desktop
* gnu/packages/gnome.scm (gnome-shell)[inputs]: Add libnma, upower.
[arguments]<#:phases>[patch-install-paths]: Use standard GI repository
installation directory.
-rw-r--r--gnu/packages/gnome.scm10
1 files 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 @@ configuration of various aspects of your desktop.")
                (("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 @@ configuration of various aspects of your desktop.")
        ("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