[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#70855] [PATCH 17/92] gnu: qtile: Improve package style.
From: |
Nicolas Graves |
Subject: |
[bug#70855] [PATCH 17/92] gnu: qtile: Improve package style. |
Date: |
Fri, 10 May 2024 00:53:12 +0200 |
* gnu/packages/wm.scm (qtile): Indent as needed. Light rewrite using
format instead of string-append in [arguments]<#:phases>. Ensure
lines wrap with intended length.
Change-Id: I297718138642d24604743137f3181bfc76a51b54
---
gnu/packages/wm.scm | 72 +++++++++++++++++++++++----------------------
1 file changed, 37 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 3ae4d03839b..a1c94fe13a9 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -597,11 +597,11 @@ (define-public qtile
(name "qtile")
(version "0.23.0")
(source
- (origin
- (method url-fetch)
- (uri (pypi-uri "qtile" version))
- (sha256
- (base32 "1v8rxm2xg2igxv6gwa78wrkxzgfxmxfgflbjdp4fm7cxjdx3zrpa"))))
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "qtile" version))
+ (sha256
+ (base32 "1v8rxm2xg2igxv6gwa78wrkxzgfxmxfgflbjdp4fm7cxjdx3zrpa"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -611,26 +611,28 @@ (define-public qtile
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "libqtile/pangocffi.py"
- (("^gobject = ffi.dlopen.*")
- (string-append "gobject = ffi.dlopen(\""
- (assoc-ref inputs "glib") "/lib/libgobject-2.0.so.0\")\n"))
- (("^pango = ffi.dlopen.*")
- (string-append "pango = ffi.dlopen(\""
- (assoc-ref inputs "pango") "/lib/libpango-1.0.so.0\")\n"))
- (("^pangocairo = ffi.dlopen.*")
- (string-append "pangocairo = ffi.dlopen(\""
- (assoc-ref inputs "pango")
"/lib/libpangocairo-1.0.so.0\")\n")))))
- (add-after 'install 'install-xsession
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (xsessions (string-append out "/share/xsessions"))
- (qtile (string-append out "/bin/qtile start")))
- (mkdir-p xsessions)
- (copy-file "resources/qtile.desktop" (string-append xsessions
"/qtile.desktop"))
- (substitute* (string-append xsessions "/qtile.desktop")
- (("qtile start") qtile)))))
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "libqtile/pangocffi.py"
+ (("^(gobject = ffi.dlopen).*" all def)
+ (format #f "~a(~s)~%" def
+ (search-input-file inputs
"/lib/libgobject-2.0.so.0")))
+ (("^(pango = ffi.dlopen).*" all def)
+ (format #f "~a(~s)~%" def
+ (search-input-file inputs "/lib/libpango-1.0.so.0")))
+ (("^(pangocairo = ffi.dlopen).*" all def)
+ (format #f "~a(~s)~%" def
+ (search-input-file
+ inputs "/lib/libpangocairo-1.0.so.0"))))))
+ (add-after 'install 'install-xsessions
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (xsessions (string-append out "/share/xsessions"))
+ (qtile (string-append out "/bin/qtile start")))
+ (mkdir-p xsessions)
+ (copy-file "resources/qtile.desktop"
+ (string-append xsessions "/qtile.desktop"))
+ (substitute* (string-append xsessions "/qtile.desktop")
+ (("qtile start") qtile)))))
(add-before 'check 'pre-check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
@@ -639,17 +641,17 @@ (define-public qtile
(setenv "DISPLAY" ":1")
(setenv "XDG_CACHE_HOME" "/tmp")))))))
(inputs
- (list glib pango pulseaudio))
+ (list glib pango pulseaudio))
(propagated-inputs
- (list python-cairocffi
- python-cffi
- python-dateutil
- python-dbus-next
- python-iwlib
- python-keyring
- python-mpd2
- python-pyxdg
- python-xcffib))
+ (list python-cairocffi
+ python-cffi
+ python-dateutil
+ python-dbus-next
+ python-iwlib
+ python-keyring
+ python-mpd2
+ python-pyxdg
+ python-xcffib))
(native-inputs
(list pkg-config
python-flake8
--
2.41.0
- [bug#70855] [PATCH 00/92] python-team patches, Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 01/92] gnu: python-seaborn: Correct dependencies., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 02/92] gnu: python-transient: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 03/92] gnu: python-black: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 07/92] gnu: python-http-ece: Update to 1.2.0., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 04/92] gnu: python-isort: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 16/92] gnu: qtile: Update to 0.23.0., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 10/92] gnu: vdirsyncer: Move to pyproject-build-system and enable tests., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 17/92] gnu: qtile: Improve package style.,
Nicolas Graves <=
- [bug#70855] [PATCH 09/92] gnu: python-aionotify: Update to 0.3.0., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 12/92] gnu: python-docker-pycreds: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 21/92] gnu: conda: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 13/92] gnu: Add xcffibgen., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 05/92] gnu: python-codespell: Improve package style., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 06/92] gnu: python-mutagen: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 08/92] gnu: python-zope-i18nmessageid: Update to 5.1.1., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 18/92] gnu: sshuttle: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 30/92] gnu: python-dateutil: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 29/92] gnu: python-pypujs: Improve package style., Nicolas Graves, 2024/05/09