Merge pull request #826 from ch4og/guix-fixes

Multiple Guix package fixes
This commit is contained in:
DreamMaoMao 2026-04-05 18:42:22 +08:00
commit e3a0d54b9a

View file

@ -15,7 +15,7 @@
#:use-module (gnu packages ninja) #:use-module (gnu packages ninja)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
#:use-module (guix licenses)) #:use-module ((guix licenses) #:prefix license:))
(define-public mangowm-git (define-public mangowm-git
@ -36,10 +36,13 @@
(add-before 'configure 'patch-meson (add-before 'configure 'patch-meson
(lambda _ (lambda _
(substitute* "meson.build" (substitute* "meson.build"
;; MangoWM ignores sysconfdir handling for NixOS.
;; We also need to skip that sysconfdir edits.
(("is_nixos = false")
"is_nixos = true")
;; Unhardcode path. Fixes loading default config.
(("'-DSYSCONFDIR=\\\"@0@\\\"'.format\\('/etc'\\)") (("'-DSYSCONFDIR=\\\"@0@\\\"'.format\\('/etc'\\)")
"'-DSYSCONFDIR=\"@0@\"'.format(sysconfdir)") "'-DSYSCONFDIR=\"@0@\"'.format(sysconfdir)")))))))
(("sysconfdir = sysconfdir.substring\\(prefix.length\\(\\)\\)")
"")))))))
(inputs (list wayland (inputs (list wayland
libinput libinput
libdrm libdrm
@ -52,14 +55,17 @@
pcre2 pcre2
libxcb libxcb
xcb-util-wm xcb-util-wm
wlroots wlroots-0.19
scenefx)) scenefx))
(native-inputs (list pkg-config wayland-protocols)) (native-inputs (list pkg-config wayland-protocols))
(home-page "https://github.com/DreamMaoMao/mangowm") (home-page "https://github.com/mangowm/mango")
(synopsis "Wayland compositor based on wlroots and scenefx") (synopsis "Wayland compositor based on wlroots and scenefx")
(description "A Wayland compositor based on wlroots and scenefx, (description
inspired by dwl but aiming to be more feature-rich.") "MangoWM is a modern, lightweight, high-performance Wayland compositor
(license gpl3))) built on dwl crafted for speed, flexibility, and a customizable desktop experience.")
(license (list license:gpl3 ;mangowm itself, dwl
license:expat ;dwm, sway, wlroots
license:cc0)))) ;tinywl
(define-deprecated-package mangowc (define-deprecated-package mangowc
mangowm-git) mangowm-git)