gnu: gnome-recipes: Apply new style.
* gnu/packages/gnome.scm (gnome-recipes): Reindent. [#:phases]: Use gexps. Remove trailing #t. Add direct reference to libgd. [inputs]: Remove labels. [native-inputs]: Likewise. Remove libgd.
parent
3576bc7778
commit
1f5298b926
|
@ -829,45 +829,42 @@ patterns.")
|
||||||
"1h049mzqnlcfqwrhmzbq3pzzdglvy2bn9fj1p8wql7a60pn8sr32"))))
|
"1h049mzqnlcfqwrhmzbq3pzzdglvy2bn9fj1p8wql7a60pn8sr32"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:glib-or-gtk? #t
|
(list
|
||||||
|
#:glib-or-gtk? #t
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'skip-gtk-update-icon-cache
|
(add-after 'unpack 'skip-gtk-update-icon-cache
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "meson_post_install.py"
|
(substitute* "meson_post_install.py"
|
||||||
(("gtk-update-icon-cache") (which "true")))
|
(("gtk-update-icon-cache") (which "true")))))
|
||||||
#t))
|
|
||||||
(add-after 'unpack 'unpack-libgd
|
(add-after 'unpack 'unpack-libgd
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda _
|
||||||
(let ((libgd (assoc-ref inputs "libgd")))
|
(copy-recursively
|
||||||
(copy-recursively libgd "subprojects/libgd")
|
#$(origin
|
||||||
#t))))))
|
|
||||||
(inputs
|
|
||||||
`(("glib" ,glib)
|
|
||||||
("gnome-autoar" ,gnome-autoar)
|
|
||||||
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
|
|
||||||
("gspell" ,gspell)
|
|
||||||
("gtk+" ,gtk+)
|
|
||||||
("json-glib" ,json-glib)
|
|
||||||
("libcanberra" ,libcanberra)
|
|
||||||
("libsoup" ,libsoup)
|
|
||||||
("rest" ,rest)))
|
|
||||||
(native-inputs
|
|
||||||
`(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
|
|
||||||
("gettext" ,gettext-minimal)
|
|
||||||
("glib:bin" ,glib "bin")
|
|
||||||
("itstool" ,itstool)
|
|
||||||
("libgd"
|
|
||||||
,(origin
|
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://gitlab.gnome.org/GNOME/libgd")
|
(url "https://gitlab.gnome.org/GNOME/libgd")
|
||||||
(commit "c7c7ff4e05d3fe82854219091cf116cce6b19de0")))
|
(commit "c7c7ff4e05d3fe82854219091cf116cce6b19de0")))
|
||||||
(file-name (git-file-name "libgd" version))
|
(file-name (git-file-name "libgd" version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "16yld0ap7qj1n96h4f2sqkjmibg7xx5xwkqxdfzam2nmyfdlrrrs"))))
|
(base32
|
||||||
("pkg-config" ,pkg-config)
|
"16yld0ap7qj1n96h4f2sqkjmibg7xx5xwkqxdfzam2nmyfdlrrrs")))
|
||||||
("python" ,python)))
|
"subprojects/libgd"))))))
|
||||||
|
(inputs (list glib
|
||||||
|
gnome-autoar
|
||||||
|
`(,gnome-online-accounts "lib")
|
||||||
|
gspell
|
||||||
|
gtk+
|
||||||
|
json-glib
|
||||||
|
libcanberra
|
||||||
|
libsoup
|
||||||
|
rest))
|
||||||
|
(native-inputs (list desktop-file-utils ;for update-desktop-database
|
||||||
|
gettext-minimal
|
||||||
|
`(,glib "bin")
|
||||||
|
itstool
|
||||||
|
pkg-config
|
||||||
|
python))
|
||||||
(home-page "https://wiki.gnome.org/Apps/Recipes")
|
(home-page "https://wiki.gnome.org/Apps/Recipes")
|
||||||
(synopsis "Discover recipes for preparing food")
|
(synopsis "Discover recipes for preparing food")
|
||||||
(description "GNOME Recipes helps you discover what to cook today,
|
(description "GNOME Recipes helps you discover what to cook today,
|
||||||
|
|
Reference in New Issue