From 5bf4be15d210a87270b6750ba840e2bb21bfa378 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Tue, 7 Feb 2023 11:06:06 +0800 Subject: [PATCH 1/3] gnu: cagebreak: Update to 2.0.1. * gnu/packages/wm.scm (cagebreak): Update to 2.0.1. --- gnu/packages/wm.scm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3cfe7b9707..8ed6642498 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -145,6 +145,7 @@ #:use-module (gnu packages sphinx) #:use-module (gnu packages suckless) #:use-module (gnu packages texinfo) + #:use-module (gnu packages terminals) #:use-module (gnu packages textutils) #:use-module (gnu packages time) #:use-module (gnu packages video) @@ -2680,7 +2681,7 @@ shows a notification for the user on the screen.") (define-public cagebreak (package (name "cagebreak") - (version "1.8.0") + (version "2.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -2689,13 +2690,28 @@ shows a notification for the user on the screen.") (file-name (git-file-name name version)) (sha256 (base32 - "0296mnzk7qd0zvnhw716jvpp7madjsar373ixx4qcff0m0jwfrxm")))) + "0fxfmxl7p63l07lqb83q5lx16hm0rixcidghx00gp08x2yrgr4x9")))) (build-system meson-build-system) - (arguments '(#:configure-flags '("-Dxwayland=true"))) + (arguments + (list + #:configure-flags #~'("-Dxwayland=true") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-config-example + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "examples/config" + ;; Using a terminal support wayland seem to a good idea. + (("xterm") (search-input-file inputs "/bin/foot")) + ;; Guix include icecat instead of firefox. + (("firefox") "icecat")))) + (add-after 'unpack 'patch-source-paths + (lambda _ + (substitute* '("cagebreak.c" "meson.build") + (("/etc/xdg") (string-append #$output "/etc/xdg")))))))) (native-inputs (list pandoc pkg-config)) (inputs - (list libevdev pango wlroots)) + (list foot libevdev pango wlroots)) (home-page "https://github.com/project-repo/cagebreak") (synopsis "Tiling wayland compositor inspired by ratpoison") (description @@ -2724,7 +2740,7 @@ for wayland conceptually based on the X11 window manager `(#:tests? #f)) ;; no tests (home-page "https://github.com/vstakhov/libucl") (synopsis "Universal configuration language (UCL) parser") - (description "libucl implements a configuration language that is easy to + (description "libucl implements a configuration language that is easy to read and write, and compatible with JSON.") (license license:bsd-2))) -- 2.30.2