From patchwork Sun Nov 12 15:54:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Karl Hallsby X-Patchwork-Id: 56375 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0884D27BBE9; Sun, 12 Nov 2023 15:55:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D4E127BBE2 for ; Sun, 12 Nov 2023 15:55:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r2Co3-000182-1y; Sun, 12 Nov 2023 10:55:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2Cnx-00017V-Tr for guix-patches@gnu.org; Sun, 12 Nov 2023 10:55:23 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r2Cnx-0004Pk-H6 for guix-patches@gnu.org; Sun, 12 Nov 2023 10:55:21 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r2Cob-0001Tj-VT for guix-patches@gnu.org; Sun, 12 Nov 2023 10:56:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66623] [PATCH] gnu: Add mahogany References: In-Reply-To: Resent-From: Karl Hallsby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Nov 2023 15:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66623 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66623@debbugs.gnu.org Cc: Karl Hallsby Received: via spool by 66623-submit@debbugs.gnu.org id=B66623.16998045135602 (code B ref 66623); Sun, 12 Nov 2023 15:56:01 +0000 Received: (at 66623) by debbugs.gnu.org; 12 Nov 2023 15:55:13 +0000 Received: from localhost ([127.0.0.1]:56789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r2Cnp-0001SI-8L for submit@debbugs.gnu.org; Sun, 12 Nov 2023 10:55:13 -0500 Received: from mail-ot1-x329.google.com ([2607:f8b0:4864:20::329]:56415) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r2Cnk-0001Rx-4e for 66623@debbugs.gnu.org; Sun, 12 Nov 2023 10:55:11 -0500 Received: by mail-ot1-x329.google.com with SMTP id 46e09a7af769-6cf65093780so2229461a34.0 for <66623@debbugs.gnu.org>; Sun, 12 Nov 2023 07:54:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hallsby.com; s=google; t=1699804461; x=1700409261; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nLLfQPlMIWJXYF4IaQDu4Ru6MRTNSQ/+2GOCV4+t8A0=; b=mlqQmuTwEOfnrj18u+MPIWhhZ50oEVWJZ0CnTTQ1BRMVD8ShiJOzq4kR9Zp5SMHjLb myIEh+U7djoorQmpBId7cQpZcSi1F/WHiI0cx7VqRqFEXv4eyrRjgDLys8vvorZtHfxV m2Wmon6eAhzaBej2/1wrwrAtBp/7eHpWrsG3BkXPhnxJWN5kj93n10vFKwpN6KoXDczH EC7L0rSnM7QvFMo1wtmTIUg1/Ez4csExHWw9hcP6KEDV5s/Me7r6yNf6N3g+sgqpwB5Y XxjazUtTwiS2gcQ/KdnijwKNuEz6VD0CfSt0mm/k6NGw54TkB776bOjyjE6ZjHo+hO1h ybkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699804461; x=1700409261; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nLLfQPlMIWJXYF4IaQDu4Ru6MRTNSQ/+2GOCV4+t8A0=; b=MOqfu4yC+VeT78+M30ICB9EVrqqSrVl89J1J+lu2T8fVtWZDZpYlh2szPUD5LoUuUF Lfa4H6fXseWNmyX/6dqxcbOkoB/kxWQ+iXSYATDOjVEo1t6nMTVTMDAYmR/jQX8NANjY x70AgjFTBsM100NTCENeM3Xs/pz9aTepsZ4uQWZK3/TbDJKDIoByjCGP/YxB+iZmBUtf +oZ7MKj58qwyDKHnUtAbBDtCzJ/LF7mT/vM4FQS55BNSddWeEv57wnuMFLhtBmMd+5xZ xfSvQn0XjepjZzOv9pxDU8xrXq1gtrPX3whOLtNGj8RliXMqZrD+/u1jpR1yg0eEBmJ+ 0E9w== X-Gm-Message-State: AOJu0YzeHybtbxk0GbghsBq2If3XBPqujq9x9/J5fbx12RNCWRRambjP 3hNzVWatcrFlYAspfIl1I7AUhnJ5alOPKIMr+W0= X-Google-Smtp-Source: AGHT+IFHcGyCzMZKroUyDvZO3lv1kgoH8opxtxnzFP8S1GL8biDtmBYHeXblaIbGCmfVkwd0dLcCyA== X-Received: by 2002:a9d:6643:0:b0:6bc:fab5:e996 with SMTP id q3-20020a9d6643000000b006bcfab5e996mr5232384otm.31.1699804461109; Sun, 12 Nov 2023 07:54:21 -0800 (PST) Received: from avocato.23.scconf.org ([2001:468:1f07:9b:ba10:3462:f5f6:499e]) by smtp.gmail.com with ESMTPSA id r6-20020a4a4e06000000b0058a1ae9e0ddsm678037ooa.2.2023.11.12.07.54.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Nov 2023 07:54:20 -0800 (PST) Date: Sun, 12 Nov 2023 09:54:13 -0600 Message-ID: <20231112155415.8342-1-karl@hallsby.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Karl Hallsby X-ACL-Warn: , Karl Hallsby via Guix-patches X-Patchwork-Original-From: Karl Hallsby via Guix-patches via From: Karl Hallsby Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wm.scm (New variable): Add mahogany window manager. gnu: Add mahogany-heart package * gnu/packages/wm.scm (New variable): Add mahogany-heart package at same revision as mahogany. --- gnu/packages/wm.scm | 120 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) base-commit: 970e69bdc78023b444ab3d9a81b07b1a02fc9ab1 diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 8576d0297d..745dc939ee 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2023 Jonathan Brielamier ;;; Copyright © 2023 Vessel Wave ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023 Raven Hallsby ;;; ;;; This file is part of GNU Guix. ;;; @@ -2614,6 +2615,125 @@ (define-public sbcl-stumpwm-battery-portable modeline. It can be displayed in the modeline with %B.") (license (list license:expat license:gpl3+)))) +(define-public mahogany + (let ((commit "4b6b5f8667d8bfa07b889e9298e995f8eebb20bd") + (revision "0")) + (package + (name "mahogany") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stumpwm/mahogany") + (commit commit))) + (file-name (git-file-name "mahogany" version)) + (sha256 + (base32 "11kffkkimfk689r5cc351kxr7dadcj3d8dhm2ffvd5b2lz9jwlqp")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-fiasco + sbcl-prove)) + (inputs + (list mahogany-heart + sbcl-xkbcommon + libxkbcommon + sbcl-cl-wayland + sbcl-alexandria + sbcl-cl-ansi-text + sbcl-terminfo + sbcl-snakes + sbcl-iterate + sbcl-cffi ;; Provides cffi-grovel + wayland + wayland-protocols + wlroots)) + (outputs '("out" "lib")) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-submodules + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively "./dependencies") + (delete-file-recursively "./heart"))) + (add-after 'delete-submodules 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "lisp/bindings/hrt-libs.lisp" + (("libheart.so") + (search-input-file inputs + "/lib/libheart.so")) + (("libwlroots.so") + (search-input-file inputs + "/lib/libwlroots.so"))))) + (add-after 'create-asdf-configuration 'build-program + (lambda* (#:key outputs #:allow-other-keys) + (build-program + (string-append (assoc-ref outputs "out") "/bin/mahogany") + outputs + #:entry-program '((mahogany::run-server) 0)))) + (add-after 'build-program 'create-desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xsessions (string-append out "/share/xsessions")) + (wayland-sessions (string-append out "/share/wayland-sessions"))) + (define (desktop-file file) + (format file + "[Desktop Entry]~@ + Name=stumpwm~@ + Comment=The Mahogany Window Manager~@ + Exec=~a/bin/mahogany~@ + TryExec=~@*~a/bin/mahogany~@ + Icon=~@ + Type=Application~%" + out)) + (mkdir-p xsessions) + (call-with-output-file + (string-append xsessions "/mahogany.desktop") + desktop-file) + (mkdir-p wayland-sessions) + (call-with-output-file + (string-append wayland-sessions "/mahogany.desktop") + desktop-file))))))) + (synopsis "Window manager for Wayland written in Common Lisp") + (description + "Mahogany is a tiling window manager for Wayland modeled after StumpWM. +While it is not a drop-in replacement for stumpwm, stumpwm users should be +very comfortable with Mahogany.") + (home-page "https://github.com/stumpwm/mahogany") + (license license:gpl2+)))) + +(define-public mahogany-heart + (package + (name "mahogany-heart") + (version (package-version mahogany)) + (source (package-source mahogany)) + (build-system meson-build-system) + (native-inputs + (list pkg-config)) + (inputs + (list wlroots + libxkbcommon)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "heart"))) + (add-after 'chdir 'delete-submodules + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively "./subprojects")))))) + (synopsis "An alternative C backend to a Wayland compositor to use with Mahogany") + (description + "Mahogany-heart's task is to setup the initial state of the +compositor, render the output, and initially handle new connections to +the compositor. If needed, the backend will also wrap some wlroots +functions so that less foreign code needs to be called from the other +language. is a tiling window manager for Wayland modeled after +StumpWM.") + (home-page (package-home-page mahogany)) + (license (package-license mahogany)))) + (define-public lemonbar (package (name "lemonbar")