[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#57889] [PATCH 7/8] gnu: gfeeds: Modernize package description.
From: |
Liliana Marie Prikler |
Subject: |
[bug#57889] [PATCH 7/8] gnu: gfeeds: Modernize package description. |
Date: |
Thu, 15 Sep 2022 22:16:55 +0200 |
* gnu/packages/syndication.scm (gfeeds)[arguments]: Convert to list of
G-Expressions. Drop trailing #t.
[native-inputs]: Drop labels.
[inputs]: Add bash-minimal.
---
gnu/packages/syndication.scm | 52 +++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 5e204c21ad..dcd01d8933 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -26,6 +26,7 @@ (define-module (gnu packages syndication)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (guix gexp)
#:use-module (guix build-system cargo)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
@@ -35,6 +36,7 @@ (define-module (gnu packages syndication)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
@@ -508,33 +510,33 @@ (define-public gfeeds
"045889417506w2l25j7jxx7jfdpfljbirhm1s4whvhk83xap19zb"))))
(build-system meson-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-mpv-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "gfeeds/confManager.py"
- (("mpv") (search-input-file inputs "/bin/mpv")))
- #t))
- (add-after 'unpack 'patch-webkit2-version
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "bin/gfeeds.in"
- (("gi\\.require_version\\('WebKit2', '4\\.0'\\)")
- "gi.require_version('WebKit2', '4.1')"))))
- (add-after 'install 'wrap-gfeeds
- (lambda* (#:key outputs #:allow-other-keys)
- (wrap-program (string-append
- (assoc-ref outputs "out") "/bin/gfeeds")
- `("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
- `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))
- `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS"))))
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-mpv-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "gfeeds/confManager.py"
+ (("mpv") (search-input-file inputs "/bin/mpv")))))
+ (add-after 'unpack 'patch-webkit2-version
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "bin/gfeeds.in"
+ (("gi\\.require_version\\('WebKit2', '4\\.0'\\)")
+ "gi.require_version('WebKit2', '4.1')"))))
+ (add-after 'install 'wrap-gfeeds
+ (lambda* (#:key outputs #:allow-other-keys)
+ (wrap-program (string-append
+ (assoc-ref outputs "out") "/bin/gfeeds")
+ `("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
+ `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))
+ `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS")))))))))
(native-inputs
- `(("glib:bin" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("gtk+:bin" ,gtk+ "bin")
- ("pkg-config" ,pkg-config)))
+ (list `(,glib "bin")
+ `(,gtk+ "bin")
+ gobject-introspection
+ pkg-config))
(inputs
- (list glib
+ (list bash-minimal
+ glib
gsettings-desktop-schemas
gtk+
hicolor-icon-theme
--
2.37.3
- [bug#57889] [PATCH 0/8] Add gfeeds-next, Liliana Marie Prikler, 2022/09/17
- [bug#57889] [PATCH 2/8] gnu: pugixml: Update to 1.12.1., Liliana Marie Prikler, 2022/09/17
- [bug#57889] [PATCH 5/8] gnu: Add syndication-domination., Liliana Marie Prikler, 2022/09/17
- [bug#57889] [PATCH 3/8] gnu: Add python-timeout-decorator., Liliana Marie Prikler, 2022/09/17
- [bug#57889] [PATCH 6/8] gnu: gfeeds: Use git origin., Liliana Marie Prikler, 2022/09/17
- [bug#57889] [PATCH 7/8] gnu: gfeeds: Modernize package description.,
Liliana Marie Prikler <=
- [bug#57889] [PATCH 4/8] gnu: Add python-readability-lxml., Liliana Marie Prikler, 2022/09/17
- [bug#57889] [PATCH 1/8] gnu: blueprint-compiler: Wrap GUIX_PYTHONPATH and GI_TYPELIB_PATH., Liliana Marie Prikler, 2022/09/17
- [bug#57889] [PATCH 8/8] gnu: Add gfeeds-next., Liliana Marie Prikler, 2022/09/17