GNU bug report logs - #72406
[PATCH emacs-team WIP 0/4] Simplify creation of emacs package variants

Previous Next

Full log

Message #125 received at 72406 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 72406 <at> debbugs.gnu.org
Cc: gemmaro.dev <at> gmail.com
Subject: [PATCH emacs-team WIP v4 21/24] gnu: emacs-exwm: Build variants.
Date: Sun, 11 Aug 2024 14:58:49 +0200

* 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.