TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: gnome-weather: Fix GNOME integration.

Browse source 
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.
This commit is contained in:
Mathieu Othacehe 2021-09-27 11:48:38 +00:00
parent 57b32debe3
commit 391fb7a60a
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
gnu/packages/gnome.scm
View file

@ -9213,10 +9213,8 @@ (define-public gnome-weather
("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)
@ -9224,24 +9222,29 @@ (define-public gnome-weather
(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