GNU bug report logs -
#68742
[PATCH] gnu: river: add river.desktop on wayland-sessions
Previous Next
Reported by: Erik Eduardo <eduarskate8 <at> gmail.com>
Date: Fri, 26 Jan 2024 17:24:02 UTC
Severity: normal
Tags: patch
Done: Christopher Baines <mail <at> cbaines.net>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68742 in the body.
You can then email your comments to 68742 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
ekaitz <at> elenq.tech, guix-patches <at> gnu.org
:
bug#68742
; Package
guix-patches
.
(Fri, 26 Jan 2024 17:24:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Erik Eduardo <eduarskate8 <at> gmail.com>
:
New bug report received and forwarded. Copy sent to
ekaitz <at> elenq.tech, guix-patches <at> gnu.org
.
(Fri, 26 Jan 2024 17:24:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Erik Eduardo <erikeah <at> protonmail.com>
This patch will allow to login from login managers or display managers
to River.
Changes:
- Creates a directory at share named wayland-sessions
- Install a desktop file from repo inside share/wayland-sessions
This is my first patch, please be patient and give me feedback, I will
do my best.
Change-Id: Iea8999cf97bedc8fb7ede4dd22b8f0f9529d2fa1
---
gnu/packages/zig-xyz.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 200b5c9940..ca73c6bad8 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -52,7 +52,16 @@ (define-public river
(build-system zig-build-system)
(arguments
(list
- #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'install-extra-files
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (wayland-sessions (string-append out
+ "/share/wayland-sessions")))
+ (mkdir-p wayland-sessions)
+ (install-file "contrib/river.desktop"
+ wayland-sessions)))))
+ #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
#:zig-release-type "safe"))
(native-inputs (list libevdev
libxkbcommon
base-commit: 2266754382bce43789976aec65181cb5085c8bc4
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#68742
; Package
guix-patches
.
(Mon, 29 Jan 2024 16:42:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 68742 <at> debbugs.gnu.org (full text, mbox):
Hi
On 2024-01-26 18:09, Erik Eduardo wrote:
> From: Erik Eduardo <erikeah <at> protonmail.com>
>
> This patch will allow to login from login managers or display managers
> to River.
>
> Changes:
>
> - Creates a directory at share named wayland-sessions
> - Install a desktop file from repo inside share/wayland-sessions
>
> This is my first patch, please be patient and give me feedback, I will
> do my best.
>
> Change-Id: Iea8999cf97bedc8fb7ede4dd22b8f0f9529d2fa1
> ---
> gnu/packages/zig-xyz.scm | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
> index 200b5c9940..ca73c6bad8 100644
> --- a/gnu/packages/zig-xyz.scm
> +++ b/gnu/packages/zig-xyz.scm
> @@ -52,7 +52,16 @@ (define-public river
> (build-system zig-build-system)
> (arguments
> (list
> - #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
> + #:phases #~(modify-phases %standard-phases
> + (add-after 'install 'install-extra-files
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out"))
> + (wayland-sessions (string-append out
> + "/share/wayland-sessions")))
> + (mkdir-p wayland-sessions)
> + (install-file "contrib/river.desktop"
> + wayland-sessions)))))
> + #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
> #:zig-release-type "safe"))
> (native-inputs (list libevdev
> libxkbcommon
>
> base-commit: 2266754382bce43789976aec65181cb5085c8bc4
Looks good to me, but guix commits follow changelog format:
https://www.gnu.org/prep/standards/standards.html#Change-Logs
The rest of it looks ok. Please resend with the message fixed and I'll
take a further look.
Thanks a lot for contributing to Guix.
Ekaitz
Information forwarded
to
ekaitz <at> elenq.tech, guix-patches <at> gnu.org
:
bug#68742
; Package
guix-patches
.
(Wed, 31 Jan 2024 08:37:01 GMT)
Full text and
rfc822 format available.
Message #11 received at 68742 <at> debbugs.gnu.org (full text, mbox):
From: Erik Eduardo <erikeah <at> protonmail.com>
* gnu/packages/zig-xyz.scm (river)[arguments]: Add 'install-extra-files
phase after 'install phase to install the river.desktop file inside
share/wayland-sessions directory.
Change-Id: I19fbcfa09a6b06ed602ec4be1b06cc6e2cd2a9a1
---
gnu/packages/zig-xyz.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 200b5c9940..ca73c6bad8 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -52,7 +52,16 @@ (define-public river
(build-system zig-build-system)
(arguments
(list
- #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'install-extra-files
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (wayland-sessions (string-append out
+ "/share/wayland-sessions")))
+ (mkdir-p wayland-sessions)
+ (install-file "contrib/river.desktop"
+ wayland-sessions)))))
+ #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
#:zig-release-type "safe"))
(native-inputs (list libevdev
libxkbcommon
base-commit: 66dd088d3c3404f5cbe2d4d4c5e8f93d184703b0
--
2.41.0
Thanks a lot for the welcoming! Here it's the patch with commit message fixed.
Information forwarded
to
ekaitz <at> elenq.tech, guix-patches <at> gnu.org
:
bug#68742
; Package
guix-patches
.
(Thu, 08 Feb 2024 17:33:01 GMT)
Full text and
rfc822 format available.
Message #14 received at 68742 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/zig-xyz.scm (river)[arguments]: Add
'install-wayland-session phase after 'install phase to install the
river.desktop file inside share/wayland-sessions directory
Change-Id: I19fbcfa09a6b06ed602ec4be1b06cc6e2cd2a9a1
---
gnu/packages/zig-xyz.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 200b5c9940..8343555660 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -52,7 +52,16 @@ (define-public river
(build-system zig-build-system)
(arguments
(list
- #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'install-wayland-session
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (wayland-sessions (string-append out
+ "/share/wayland-sessions")))
+ (mkdir-p wayland-sessions)
+ (install-file "contrib/river.desktop"
+ wayland-sessions)))))
+ #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
#:zig-release-type "safe"))
(native-inputs (list libevdev
libxkbcommon
base-commit: cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#68742
; Package
guix-patches
.
(Thu, 08 Feb 2024 19:10:02 GMT)
Full text and
rfc822 format available.
Message #17 received at 68742 <at> debbugs.gnu.org (full text, mbox):
Hi,
On 2024-02-08 18:32, Erik Eduardo wrote:
> * gnu/packages/zig-xyz.scm (river)[arguments]: Add
> 'install-wayland-session phase after 'install phase to install the
> river.desktop file inside share/wayland-sessions directory
>
> Change-Id: I19fbcfa09a6b06ed602ec4be1b06cc6e2cd2a9a1
> ---
> gnu/packages/zig-xyz.scm | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
> index 200b5c9940..8343555660 100644
> --- a/gnu/packages/zig-xyz.scm
> +++ b/gnu/packages/zig-xyz.scm
> @@ -52,7 +52,16 @@ (define-public river
> (build-system zig-build-system)
> (arguments
> (list
> - #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
> + #:phases #~(modify-phases %standard-phases
> + (add-after 'install 'install-wayland-session
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out"))
> + (wayland-sessions (string-append out
> + "/share/wayland-sessions")))
> + (mkdir-p wayland-sessions)
> + (install-file "contrib/river.desktop"
> + wayland-sessions)))))
> + #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
> #:zig-release-type "safe"))
> (native-inputs (list libevdev
> libxkbcommon
>
> base-commit: cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d
Looks good to me. But I don't have commit access.
If I get access I'll push. Also if someone wants to push this, I'll be
grateful.
Let's hope it is pushed soon.
Thanks!
Information forwarded
to
guix-patches <at> gnu.org
:
bug#68742
; Package
guix-patches
.
(Fri, 09 Feb 2024 14:14:02 GMT)
Full text and
rfc822 format available.
Message #20 received at 68742 <at> debbugs.gnu.org (full text, mbox):
On 2024-02-08 18:32, Erik Eduardo wrote:
> * gnu/packages/zig-xyz.scm (river)[arguments]: Add
> 'install-wayland-session phase after 'install phase to install the
> river.desktop file inside share/wayland-sessions directory
>
> Change-Id: I19fbcfa09a6b06ed602ec4be1b06cc6e2cd2a9a1
> ---
> gnu/packages/zig-xyz.scm | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
> index 200b5c9940..8343555660 100644
> --- a/gnu/packages/zig-xyz.scm
> +++ b/gnu/packages/zig-xyz.scm
> @@ -52,7 +52,16 @@ (define-public river
> (build-system zig-build-system)
> (arguments
> (list
> - #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
> + #:phases #~(modify-phases %standard-phases
> + (add-after 'install 'install-wayland-session
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let* ((out (assoc-ref outputs "out"))
> + (wayland-sessions (string-append out
> + "/share/wayland-sessions")))
> + (mkdir-p wayland-sessions)
> + (install-file "contrib/river.desktop"
> + wayland-sessions)))))
> + #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
> #:zig-release-type "safe"))
> (native-inputs (list libevdev
> libxkbcommon
>
> base-commit: cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d
Oh Erik!
But we are missing something very important here!
Add your copyright header to the top of the file, the rest of us feel
alone there in the top. We need some company.
You can also use `#$output` instead of `(assoc-ref outputs "out")`,
which might be cool to use, as you are already using a gexp in the
phases for example.
Please send a new version and I'll mark it as reviewed (now I learned
how to do it :) )
Best,
Ekaitz
Information forwarded
to
ekaitz <at> elenq.tech, guix-patches <at> gnu.org
:
bug#68742
; Package
guix-patches
.
(Wed, 14 Feb 2024 12:24:02 GMT)
Full text and
rfc822 format available.
Message #23 received at 68742 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/zig-xyz.scm (river)[arguments]: Add
'install-wayland-session phase after 'install phase to install the
river.desktop file inside share/wayland-sessions directory
Change-Id: I19fbcfa09a6b06ed602ec4be1b06cc6e2cd2a9a1
---
gnu/packages/zig-xyz.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 200b5c9940..0e2053b931 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2022 Maya Tomasek <maya.tomasek <at> disroot.org>
;;; Copyright © 2023 Ekaitz Zarraga <ekaitz <at> elenq.tech>
;;; Copyright © 2023 Felix Lechner <felix.lechner <at> lease-up.com>
+;;; Copyright © 2024 Erik Eduardo <erik <at> erikeduardo.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -52,7 +53,16 @@ (define-public river
(build-system zig-build-system)
(arguments
(list
- #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'install-wayland-session
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (wayland-sessions (string-append out
+ "/share/wayland-sessions")))
+ (mkdir-p wayland-sessions)
+ (install-file "contrib/river.desktop"
+ wayland-sessions)))))
+ #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
#:zig-release-type "safe"))
(native-inputs (list libevdev
libxkbcommon
base-commit: cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#68742
; Package
guix-patches
.
(Wed, 14 Feb 2024 12:33:02 GMT)
Full text and
rfc822 format available.
Message #26 received at 68742 <at> debbugs.gnu.org (full text, mbox):
user guix
usertag 68742 + reviewed-looks-good
thanks
Guix QA review form submission:
It's a simple addition. I think it's ok.
I linted, and I also built, and things the author expected work.
Items marked as checked: Lint warnings, Package builds, Commit messages
Information forwarded
to
guix-patches <at> gnu.org
:
bug#68742
; Package
guix-patches
.
(Wed, 14 Feb 2024 13:35:02 GMT)
Full text and
rfc822 format available.
Message #29 received at submit <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Ekaitz Zarraga <ekaitz <at> elenq.tech> writes:
> user guix
> usertag 68742 + reviewed-looks-good
> thanks
>
> Guix QA review form submission:
> It's a simple addition. I think it's ok.
> I linted, and I also built, and things the author expected work.
>
> Items marked as checked: Lint warnings, Package builds, Commit messages
Thanks both, I've tweaked the indentation a little and pushed this to
master as 8d4c3032416c69f883d074f4f6d7bcc9741be75c.
Chris
[signature.asc (application/pgp-signature, inline)]
Reply sent
to
Christopher Baines <mail <at> cbaines.net>
:
You have taken responsibility.
(Wed, 14 Feb 2024 13:35:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Erik Eduardo <eduarskate8 <at> gmail.com>
:
bug acknowledged by developer.
(Wed, 14 Feb 2024 13:35:02 GMT)
Full text and
rfc822 format available.
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Thu, 14 Mar 2024 11:24:13 GMT)
Full text and
rfc822 format available.
This bug report was last modified 134 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.