[bug#57406] [PATCH] qtile desktop file install

[bug#57406] [PATCH] qtile desktop file install

[jonscoresby--- via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]

I don't know if my previous patch will be discarded or not, but it had an error (this is my first time). This is the revised, working patch.
---
gnu/packages/wm.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 7ea6840689..5084d194a6 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -579,7 +579,16 @@ (define-public qtile
(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"))))))))
+ (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))))))))
(inputs
(list glib pango pulseaudio))
(propagated-inputs
base-commit: 80baa8f87aa69151dffe04fb432a37c91d4dd242
--
2.37.2

[-- Attachment #2: Type: text/html, Size: 1754 bytes --]

[bug#57406] Format Fix

[jonscoresby--- via Guix-patches via]

I realized my email client messed up the formatting. Here is the formatted patch.

---
 gnu/packages/wm.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 7ea6840689..5084d194a6 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -579,7 +579,16 @@ (define-public qtile
                   (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"))))))))
+                  (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))))))))
     (inputs
       (list glib pango pulseaudio))
     (propagated-inputs

base-commit: 80baa8f87aa69151dffe04fb432a37c91d4dd242
-- 
2.37.2

bug#57406: Format Fix

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

jonscoresby--- via Guix-patches via <guix-patches@gnu.org> skriver:

> I realized my email client messed up the formatting. Here is the formatted patch.

Applied (with an appropriate commit message), thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]