diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2024-05-10 00:53:12 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2024-05-23 22:44:54 +0200 |
| commit | 54f33f655180395961e59938c7452626e0583d05 (patch) | |
| tree | d2badecc5db219450eab1d66833ed9ab6faf4335 | |
| parent | e55a8208c8b8a26ee3cd8c26b10b397d3fa9fc8a (diff) | |
gnu: qtile: Improve package style.
* 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
Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
| -rw-r--r-- | gnu/packages/wm.scm | 72 |
1 files changed, 37 insertions, 35 deletions
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3ae4d03839..a1c94fe13a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -597,11 +597,11 @@ subscribe to events.") (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 @@ subscribe to events.") #: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 @@ subscribe to events.") (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 |