[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
76/80: gnu: gnome-weather: Fix GNOME integration.
From: |
guix-commits |
Subject: |
76/80: gnu: gnome-weather: Fix GNOME integration. |
Date: |
Tue, 28 Sep 2021 07:21:43 -0400 (EDT) |
mothacehe pushed a commit to branch wip-gnome40
in repository guix.
commit d1b1f049b7ca1bf3ba7f10d90d5cf59d24f5f421
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Mon Sep 27 11:48:38 2021 +0000
gnu: gnome-weather: Fix GNOME integration.
Fixes: <https://issues.guix.gnu.org/39324>.
* gnu/packages/gnome.scm (gnome-weather)[inputs]: Remove gdk-pixbuf.
[arguments]: Use a gexp to defined the phases. Add a 'fix-service-file phase
and adapt 'fix-desktop-file and 'wrap phases. Remove trailing #t.
---
gnu/packages/gnome.scm | 45 ++++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a347f97..a5dbba9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9206,10 +9206,8 @@ associations for GNOME.")
("gtk+:bin" ,gtk+ "bin")
("pkg-config" ,pkg-config)))
(inputs
- `( ;("adwaita-icon-theme" ,adwaita-icon-theme)
- ("appstream-glib" ,appstream-glib)
+ `(("appstream-glib" ,appstream-glib)
("geoclue" ,geoclue)
- ("gdk-pixbuf" ,gdk-pixbuf)
("gjs" ,gjs)
("gnome-desktop" ,gnome-desktop)
("libgweather" ,libgweather)
@@ -9217,24 +9215,29 @@ associations for GNOME.")
(arguments
`(#:glib-or-gtk? #t
#:phases
- (modify-phases %standard-phases
- (add-after 'install 'fix-desktop-file
- ;; FIXME: "gapplication launch org.gnome.Weather" fails for some
reason.
- ;; See https://issues.guix.gnu.org/issue/39324.
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (applications (string-append out "/share/applications")))
- (substitute* (string-append applications
"/org.gnome.Weather.desktop")
- (("Exec=.*") "Exec=gnome-weather\n"))
- #t)))
- (add-after 'install 'wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
- ;; GNOME Weather needs the typelib files of GTK+, Pango etc at
runtime.
- (wrap-program (string-append out "/bin/gnome-weather")
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))
- #t))))))
+ ,#~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-service-file
+ (lambda _
+ (substitute* "data/org.gnome.Weather.service.in"
+ (("Exec=[[:graph:]]+")
+ (string-append "Exec=" #$output
+ "/bin/gnome-weather")))))
+ (add-after 'install 'fix-desktop-file
+ ;; FIXME: "gapplication launch org.gnome.Weather" fails for some
+ ;; reason. See https://issues.guix.gnu.org/issue/39324.
+ (lambda _
+ (let ((applications
+ (string-append #$output "/share/applications")))
+ (substitute* (string-append applications
+ "/org.gnome.Weather.desktop")
+ (("Exec=.*") "Exec=gnome-weather\n")))))
+ (add-after 'install 'wrap
+ (lambda _
+ (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")))
+ ;; GNOME Weather needs the typelib files of GTK+, Pango etc
+ ;; at runtime.
+ (wrap-program (string-append #$output "/bin/gnome-weather")
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))))
(synopsis "Weather monitoring for GNOME desktop")
(description "GNOME Weather is a small application that allows you to
monitor the current weather conditions for your city, or anywhere in the
- 10/80: gnu: gnome-desktop: Update to 40.4., (continued)
- 10/80: gnu: gnome-desktop: Update to 40.4., guix-commits, 2021/09/28
- 05/80: gnu: gnome-screenshot: Update to 40.0., guix-commits, 2021/09/28
- 20/80: gnu: gnome-calendar: Update to 40.2., guix-commits, 2021/09/28
- 24/80: gnu: amtk: Update to 5.3.1., guix-commits, 2021/09/28
- 21/80: gnu: tepl: Update to 6.00.0., guix-commits, 2021/09/28
- 44/80: gnu: eog: Update to 40.3., guix-commits, 2021/09/28
- 47/80: gnu: gsettings-desktop-schemas: Update to 40.0., guix-commits, 2021/09/28
- 32/80: gnu: sushi: Update to 3.38.1., guix-commits, 2021/09/28
- 51/80: gnu: libgdata: Update to 0.18.1., guix-commits, 2021/09/28
- 79/80: system: Introduce the os-release file., guix-commits, 2021/09/28
- 76/80: gnu: gnome-weather: Fix GNOME integration.,
guix-commits <=
- 01/80: gnu: vulkan-loader: Fix include path location., guix-commits, 2021/09/28
- 04/80: gnu: gnome-backgrounds: Update to 40.1., guix-commits, 2021/09/28
- 03/80: gnu: Update gtkmm to 4.2.0, add gtkmm@3, and adjust gtkmm@2., guix-commits, 2021/09/28
- 02/80: gnu: Add gtk., guix-commits, 2021/09/28
- 08/80: gnu: gnome-menus: Update to 3.36.0., guix-commits, 2021/09/28
- 11/80: gnu: gnome-disk-utility: Update to 40.2., guix-commits, 2021/09/28
- 09/80: gnu: gnome-user-docs: Update to 40.5., guix-commits, 2021/09/28
- 36/80: gnu: gnome-clocks: Update to 40.0., guix-commits, 2021/09/28
- 07/80: gnu: gnome-shell-extensions: Update to 40.4., guix-commits, 2021/09/28
- 06/80: gnu: gnote: Update to 40.2., guix-commits, 2021/09/28