Package: guix-patches;
Reported by: dakling <dario.klingenberg <at> web.de>
Date: Wed, 26 Feb 2020 21:27:02 UTC
Severity: normal
Tags: patch
Done: Arun Isaac <arunisaac <at> systemreboot.net>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: dario <dario.klingenberg <at> web.de> To: Pierre Neidhardt <mail <at> ambrevar.xyz> Cc: 39804 <at> debbugs.gnu.org Subject: [bug#39804] [PATCH] gnu: add emacs-exwm-next package (i.e. exwm for emacs-next) Date: Thu, 27 Feb 2020 23:04:50 +0100
Thanks for your feedback.
>> ---
>> gnu/packages/emacs-xyz.scm | 71 ++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 71 insertions(+)
>>
>> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
>> index 6b9027df8a..c6df469895 100644
>> --- a/gnu/packages/emacs-xyz.scm
>> +++ b/gnu/packages/emacs-xyz.scm
>> @@ -8601,6 +8601,77 @@ It should enable you to implement low-level X11 applications.")
>> built on top of XELB.")
>> (license license:gpl3+)))
>>
>> +(define-public emacs-exwm-next
>
> I think you don't need to copy the whole package definition. Instead,
> you could `inherit' from the original definition and only adjust the
> name, description, inputs and maybe arguments.
>
> For instance
>
> --8<---------------cut here---------------start------------->8---
> (define-public emacs-exwm-next
> (package
> (inherit emacs)
> (name "emacs-exwm-next")
> (inputs ...)
> (synopsys ...)))
> --8<---------------cut here---------------end--------------->8---
>
> See `substitute-keyword-arguments' in the fftwf package for a convenient
> way to modify just one argument.
>
>> + (package
>> + (name "emacs-exwm-next")
>> + (version "0.23")
>> + (synopsis "Emacs X window manager")
Nice - I was not aware of that. The following definition seems to work
(see also the patch at the end of this mail)
> --8<---------------cut here---------------start------------->8---
(define-public emacs-exwm-next
(package
(inherit emacs-exwm)
(name "emacs-exwm-next")
(synopsis "Emacs X window manager using the next version of emacs")
(inputs
(cons
`("emacs-next" ,emacs-next)
(delete `("emacs" ,emacs)
(package-inputs emacs-exwm))))))
> --8<---------------cut here---------------end------------->8---
>> + (arguments
>> + `(#:emacs ,emacs
>
> Shouldn't this be `emacs-next` as well?
I have to admit that I do not understand that part. If I change it to
emacs-next, the build fails with the error
> --8<---------------cut here---------------start------------->8---
phase `install' succeeded after 0.0 seconds
starting phase `make-autoloads'
Wrong type argument: stringp, nil
command "/gnu/store/1z520fgx6fiq426yf2174kal2q63a9q7-emacs-next-27.0.50-0.36abf68/bin/emacs" "--quick" "--batch" "--eval=(let ((backup-inhibited t) (generated-autoload-file \"/gnu/store/nnjcqc448yj79dxaj11fnq7s9a8zpc1z-emacs-exwm-next-test-0.23/share/emacs/site-lisp/exwm-next-test-autoloads.el\")) (update-directory-autoloads \"/gnu/store/nnjcqc448yj79dxaj11fnq7s9a8zpc1z-emacs-exwm-next-test-0.23/share/emacs/site-lisp\"))" failed with status 255
> --8<---------------cut here---------------end------------->8---
It is a bit difficult for me to understand what is going on here,
because, like I said, I do not really understand this part of the
package definition in the first place - sorry. However, without
modifying the arguments, everything seems to work.
The following patch seems to work (do I need to send it on its own? I am
new to this type of workflow.)
Best
Dario
---
gnu/packages/emacs-xyz.scm | 72 ++++----------------------------------
1 file changed, 6 insertions(+), 66 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c6df469895..3d5b650df9 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -8603,74 +8603,14 @@ built on top of XELB.")
(define-public emacs-exwm-next
(package
+ (inherit emacs-exwm)
(name "emacs-exwm-next")
- (version "0.23")
- (synopsis "Emacs X window manager")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://elpa.gnu.org/packages/exwm-"
- version ".tar"))
- (sha256
- (base32
- "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5"))))
- (build-system emacs-build-system)
- (propagated-inputs
- `(("emacs-xelb" ,emacs-xelb)))
+ (synopsis "Emacs X window manager using the next version of emacs")
(inputs
- `(("xhost" ,xhost)
- ("emacs-next" ,emacs-next)
- ("dbus" ,dbus)))
- ;; The following functions and variables needed by emacs-exwm are
- ;; not included in emacs-minimal:
- ;; scroll-bar-mode, fringe-mode
- ;; x-display-pixel-width, x-display-pixel-height
- (arguments
- `(#:emacs ,emacs
- #:phases
- (modify-phases %standard-phases
- (add-after 'build 'install-xsession
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (xsessions (string-append out "/share/xsessions"))
- (bin (string-append out "/bin"))
- (exwm-executable (string-append bin "/exwm")))
- ;; Add a .desktop file to xsessions
- (mkdir-p xsessions)
- (mkdir-p bin)
- (with-output-to-file
- (string-append xsessions "/exwm.desktop")
- (lambda _
- (format #t "[Desktop Entry]~@
- Name=~a~@
- Comment=~a~@
- Exec=~a~@
- TryExec=~:*~a~@
- Type=Application~%" ,name ,synopsis exwm-executable)))
- ;; Add a shell wrapper to bin
- (with-output-to-file exwm-executable
- (lambda _
- (format #t "#!~a ~@
- ~a +SI:localuser:$USER ~@
- exec ~a --exit-with-session ~a \"$@\" --eval '~s' ~%"
- (string-append (assoc-ref inputs "bash") "/bin/sh")
- (string-append (assoc-ref inputs "xhost") "/bin/xhost")
- (string-append (assoc-ref inputs "dbus") "/bin/dbus-launch")
- (string-append (assoc-ref inputs "emacs-next") "/bin/emacs")
- '(cond
- ((file-exists-p "~/.exwm")
- (load-file "~/.exwm"))
- ((not (featurep 'exwm))
- (require 'exwm)
- (require 'exwm-config)
- (exwm-config-default)
- (message (concat "exwm configuration not found. "
- "Falling back to default configuration...")))))))
- (chmod exwm-executable #o555)
- #t))))))
- (home-page "https://github.com/ch11ng/exwm")
- (description "EXWM is a full-featured tiling X window manager for Emacs
-built on top of XELB.")
- (license license:gpl3+)))
+ (cons
+ `("emacs-next" ,emacs-next)
+ (delete `("emacs" ,emacs)
+ (package-inputs emacs-exwm))))))
(define-public emacs-switch-window
(package
--
2.25.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.