all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 72406@debbugs.gnu.org
Cc: gemmaro.dev@gmail.com, andrew@trop.in,
	cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com
Subject: [bug#72406] [PATCH emacs-team WIP v3 21/24] gnu: emacs-exwm: Build variants.
Date: Sat, 10 Aug 2024 07:54:19 +0200	[thread overview]
Message-ID: <1f5ef683255789a648c45509a55e42c057b6a724.1723300543.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <13d156332d5c04a9ab411ee24dca58f001b6eace.1723300543.git.liliana.prikler@gmail.com>

* gnu/packages/emacs-xyz.scm (emacs-exwm)[arguments]: Drop #:emacs.
[properties]: Add ‘minimal-variant’.
(emacs-no-x-toolkit-exwm, emacs-next-exwm, emacs-pgtk-exwm): New variables.
(emacs-exwm-no-x-toolkit): Deprecate in favour of emacs-no-x-toolkit-exwm.
---
 gnu/packages/emacs-xyz.scm | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b825cd26e0..b63bd372a3 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20302,7 +20302,6 @@ (define-public emacs-exwm
     ;; x-display-pixel-width, x-display-pixel-height
     (arguments
      (list
-      #:emacs emacs
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'build 'install-xsession
@@ -20343,26 +20342,20 @@ (define-public emacs-exwm
     (description
      "EXWM is a full-featured tiling X window manager for Emacs built on top
 of XELB.")
-    (license license:gpl3+)))
+    (license license:gpl3+)
+    (properties `((minimal-variant . ,(delay emacs-no-x-toolkit-exwm))))))
 
-(define-public emacs-xelb-no-x-toolkit
-  (package
-    (inherit emacs-xelb)
-    (name "emacs-xelb-no-x-toolkit")
-    (arguments
-     (substitute-keyword-arguments (package-arguments emacs-xelb)
-       ((#:emacs emacs) `,emacs-no-x-toolkit)))))
+(define-public emacs-next-exwm
+  (package-with-emacs-next emacs-exwm))
+
+(define-public emacs-pgtk-exwm
+  (package-with-emacs-pgtk emacs-exwm))
+
+(define-public emacs-no-x-toolkit-exwm
+  (package-with-emacs-no-x-toolkit emacs-exwm))
 
 (define-public emacs-exwm-no-x-toolkit
-  (package
-    (inherit emacs-exwm)
-    (name "emacs-exwm-no-x-toolkit")
-    (synopsis "Emacs X window manager (without an X toolkit)")
-    (propagated-inputs
-     (list emacs-xelb-no-x-toolkit))
-    (arguments
-     (substitute-keyword-arguments (package-arguments emacs-exwm)
-       ((#:emacs emacs) `,emacs-no-x-toolkit)))))
+  (deprecated-package "emacs-exwm-no-x-toolkit" emacs-no-x-toolkit-exwm))
 
 (define-public emacs-switch-window
   (package
-- 
2.45.2





  parent reply	other threads:[~2024-08-10 14:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <13d156332d5c04a9ab411ee24dca58f001b6eace.1723300543.git.liliana.prikler@gmail.com>
2024-08-10  4:31 ` [bug#72406] [PATCH emacs-team WIP v3 18/24] [WIP] gnu: emacs-dvc: Build variants Liliana Marie Prikler
2024-08-10  5:02 ` [bug#72406] [PATCH emacs-team WIP v3 19/24] gnu: emacspeak: " Liliana Marie Prikler
2024-08-10  5:52 ` [bug#72406] [PATCH emacs-team WIP v3 20/24] gnu: emacs-xelb: " Liliana Marie Prikler
2024-08-10  5:54 ` Liliana Marie Prikler [this message]
2024-08-10  9:43 ` [bug#72406] [PATCH emacs-team WIP v3 22/24] gnu: emacs-exwm-x: " Liliana Marie Prikler
2024-08-10  9:43 ` [bug#72406] [PATCH emacs-team WIP v3 23/24] gnu: eless: " Liliana Marie Prikler
2024-08-10 14:15 ` [bug#72406] [PATCH emacs-team WIP v3 24/24] gnu: Build all the other emacs-* variants Liliana Marie Prikler
2024-08-11  1:53   ` Liam Hupfer via Guix-patches via
2024-08-11  6:30     ` Liliana Marie Prikler
2024-08-11 16:20       ` Liam Hupfer via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1f5ef683255789a648c45509a55e42c057b6a724.1723300543.git.liliana.prikler@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=72406@debbugs.gnu.org \
    --cc=andrew@trop.in \
    --cc=cox.katherine.e+guix@gmail.com \
    --cc=gemmaro.dev@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.