[bug#69428] [PATCH 0/4] fix sxhkd and bspwm cross-compilation.

[bug#69428] [PATCH 0/4] fix sxhkd and bspwm cross-compilation.

[Zheng Junjie]

fix sxhkd and bspwm cross-compilation

Zheng Junjie (4):
  gnu: sxhkd: Use Gexps.
  gnu: sxhkd: Remove asciidoc input.
  gnu: bspwm: Use Gexps.
  gnu: bspwm: fix cross-compilation.

 gnu/packages/wm.scm      | 16 ++++++++--------
 gnu/packages/xdisorg.scm | 20 ++++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)


base-commit: 75bad75367fcf2c289fae3b40dbcc850f92177be
-- 
2.41.0

[bug#69428] [PATCH 1/4] gnu: sxhkd: Use Gexps.

[Zheng Junjie]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 2158 bytes --]

* gnu/packages/xdisorg.scm(sxhkd)[arguments]: Use Gexps.

Change-Id: Ib2379193014fdfe21de161691dac46d6e9feb758
---
 gnu/packages/xdisorg.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 86e5086867..c8f78a9fb8 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -41,7 +41,7 @@
 ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
 ;;; Copyright © 2020 James Smith <jsubuntuxp@disroot.org>
 ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
-;;; Copyright © 2020, 2021, 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2020, 2021, 2023, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
@@ -1343,14 +1343,14 @@ (define-public sxhkd
     (inputs
      (list asciidoc libxcb xcb-util xcb-util-keysyms xcb-util-wm))
     (arguments
-     `(#:phases (modify-phases %standard-phases (delete 'configure))
-       #:tests? #f  ; no check target
-       #:make-flags
-       (list ,(string-append "CC=" (cc-for-target))
-             (string-append "PREFIX=" %output)
-             ;; Keep the documentation where the build system installs LICENSE.
-             (string-append "DOCPREFIX=" %output
-                            "/share/doc/" ,name "-" ,version))))
+     (list #:phases #~(modify-phases %standard-phases (delete 'configure))
+           #:tests? #f  ; no check target
+           #:make-flags
+           #~(list (string-append "CC=" #$(cc-for-target))
+                   (string-append "PREFIX=" #$output)
+                   ;; Keep the documentation where the build system installs LICENSE.
+                   (string-append "DOCPREFIX=" #$output
+                                  "/share/doc/" #$name "-" #$version))))
     (home-page "https://github.com/baskerville/sxhkd")
     (synopsis "Simple X hotkey daemon")
     (description "sxhkd is a simple X hotkey daemon with a powerful and
-- 
2.41.0

[bug#69428] [PATCH 2/4] gnu: sxhkd: Remove asciidoc input.

[Zheng Junjie]

asciidoc is a developing-time dependency.

* gnu/packages/xdisorg.scm(sxhkd)[inputs]: Remove asciidoc input.

Change-Id: Ib2379193014fdfe21de161691dac46d6e9feb758
---
 gnu/packages/xdisorg.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index c8f78a9fb8..eb990c1c98 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1341,7 +1341,7 @@ (define-public sxhkd
         (base32 "1winwzdy9yxvxnrv8gqpigl9y0c2px27mnms62bdilp4x6llrs9r"))))
     (build-system gnu-build-system)
     (inputs
-     (list asciidoc libxcb xcb-util xcb-util-keysyms xcb-util-wm))
+     (list libxcb xcb-util xcb-util-keysyms xcb-util-wm))
     (arguments
      (list #:phases #~(modify-phases %standard-phases (delete 'configure))
            #:tests? #f  ; no check target
-- 
2.41.0

[bug#69428] [PATCH 3/4] gnu: bspwm: Use Gexps.

[Zheng Junjie]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1786 bytes --]

* gnu/packages/wm.scm(bspwm)[arguments]: Use Gexps.

Change-Id: I47399c52c8ba9adb8ea95c2a05cc8ba4762bbca3
---
 gnu/packages/wm.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index ae8213ddae..68b381fa90 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -41,7 +41,7 @@
 ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
 ;;; Copyright © 2020 Niklas Eklund <niklas.eklund@posteo.net>
 ;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
-;;; Copyright © 2021, 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2021, 2023, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2021 qblade <qblade@protonmail.com>
 ;;; Copyright © 2021 lasnesne <lasnesne@lagunposprasihopre.org>
@@ -184,13 +184,13 @@ (define-public bspwm
            xcb-util-keysyms
            xcb-util-wm))
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (delete 'configure))           ; no configure script
-       #:tests? #f                      ; no check target
-       #:make-flags
-       (list "CC=gcc"
-             (string-append "PREFIX=" %output))))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure))           ; no configure script
+           #:tests? #f                      ; no check target
+           #:make-flags
+           #~(list "CC=gcc"
+                   (string-append "PREFIX=" #$output))))
     (home-page "https://github.com/baskerville/bspwm")
     (synopsis "Tiling window manager based on binary space partitioning")
     (description "bspwm is a tiling window manager that represents windows as
-- 
2.41.0

[bug#69428] [PATCH 4/4] gnu: bspwm: fix cross-compilation.

[Zheng Junjie]

* gnu/packages/wm.scm(bspwm)[arguments]<#:make-flags>: Use CC-FOR-TARGET.

Change-Id: I47399c52c8ba9adb8ea95c2a05cc8ba4762bbca3
---
 gnu/packages/wm.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 68b381fa90..e0ce94d8cb 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -189,7 +189,7 @@ (define-public bspwm
                (delete 'configure))           ; no configure script
            #:tests? #f                      ; no check target
            #:make-flags
-           #~(list "CC=gcc"
+           #~(list (string-append "CC=" #$(cc-for-target))
                    (string-append "PREFIX=" #$output))))
     (home-page "https://github.com/baskerville/bspwm")
     (synopsis "Tiling window manager based on binary space partitioning")
-- 
2.41.0

bug#69428: [PATCH 0/4] fix sxhkd and bspwm cross-compilation.

[宋文武 via Guix-patches via]

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> fix sxhkd and bspwm cross-compilation
>
> Zheng Junjie (4):
>   gnu: sxhkd: Use Gexps.
>   gnu: sxhkd: Remove asciidoc input.
>   gnu: bspwm: Use Gexps.
>   gnu: bspwm: fix cross-compilation.
>
>  gnu/packages/wm.scm      | 16 ++++++++--------
>  gnu/packages/xdisorg.scm | 20 ++++++++++----------
>  2 files changed, 18 insertions(+), 18 deletions(-)
>
>
> base-commit: 75bad75367fcf2c289fae3b40dbcc850f92177be

Pushed as a356eb7b94..a9495366f3, thank you!