[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch wip-gnome40 updated: gnu: gnome-weather: Fix GNOME integration.
From: |
guix-commits |
Subject: |
branch wip-gnome40 updated: gnu: gnome-weather: Fix GNOME integration. |
Date: |
Mon, 27 Sep 2021 09:33:05 -0400 |
This is an automated email from the git hooks/post-receive script.
mothacehe pushed a commit to branch wip-gnome40
in repository guix.
The following commit(s) were added to refs/heads/wip-gnome40 by this push:
new 76e2534 gnu: gnome-weather: Fix GNOME integration.
76e2534 is described below
commit 76e2534e9217c4f7747e2abc4d15a4d212a046b5
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 5fdeb17..65ed7e9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9205,10 +9205,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)
@@ -9216,24 +9214,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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch wip-gnome40 updated: gnu: gnome-weather: Fix GNOME integration.,
guix-commits <=