[bug#56094] [PATCH] gnu: Remove unnecessary sway dependency on elogind.

[bug#56094] [PATCH] gnu: Remove unnecessary sway dependency on elogind.

[muradm]

* gnu/packages/wm.scm (sway): Cleanup dependencies.
---
 gnu/packages/wm.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index d816bad871..875f73bfe2 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1588,7 +1588,6 @@ (define-public sway
                                "/bin/scdoc'")))
              #t)))))
     (inputs (list cairo
-                  elogind
                   gdk-pixbuf
                   json-c
                   libevdev
-- 
2.36.1

[bug#56094] [PATCH] gnu: Remove unnecessary sway dependency on elogind.

[Liliana Marie Prikler]

Hi,

note that "unnecessary" is quite judgmental.  Why is it unnecessary?
By default, guix tends to include "optional" inputs such as elogind.

Am Sonntag, dem 19.06.2022 um 17:39 +0300 schrieb muradm:
> * gnu/packages/wm.scm (sway): Cleanup dependencies.
The ChangeLog should explicitly say what is done, i.e. (sway)[inputs]:
Remove elogind.


What exactly is the goal here?  As far as I'm aware sway works either
with *logind or seatd or by having itself be setuid.  If the aim is to
support seatd-based services, I think having a sway-with-seatd variant
would be better.

WDYT?

[bug#56094] [PATCH] gnu: Remove unnecessary sway dependency on elogind.

[muradm]

[-- Attachment #1: Type: text/plain, Size: 1411 bytes --]


Hi,

elogind/systemd was used via wlroots actually.
wlroots dropped elogind/system in favour of libseat.
libseat can talk to either systemd, elogind or seatd.
this is already reflected in wlroots package.

setuid thing you point is reflected as warning in meson.build.
there is no functionality behind it as far as I know.
and in 1.7 meson does not look at them directly, but via wlroots.
basically informative from sway point of view.

the only thing left behind is swaybar which relays on
either systemd, elogind or basu for system tray functionality.
this could be used as argument for keeping elogind
as dependency.

you may look at #49969 which added the other day
seatd-service-type and greetd stuff.

--
muradm

Liliana Marie Prikler <liliana.prikler@ist.tugraz.at> writes:

> Hi,
>
> note that "unnecessary" is quite judgmental.  Why is it 
> unnecessary?
> By default, guix tends to include "optional" inputs such as 
> elogind.
>
> Am Sonntag, dem 19.06.2022 um 17:39 +0300 schrieb muradm:
>> * gnu/packages/wm.scm (sway): Cleanup dependencies.
> The ChangeLog should explicitly say what is done, i.e. 
> (sway)[inputs]:
> Remove elogind.
>
>
> What exactly is the goal here?  As far as I'm aware sway works 
> either
> with *logind or seatd or by having itself be setuid.  If the aim 
> is to
> support seatd-based services, I think having a sway-with-seatd 
> variant
> would be better.
>
> WDYT?


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#56094] [PATCH] gnu: Remove unnecessary sway dependency on elogind.

[Liliana Marie Prikler]

Am Montag, dem 20.06.2022 um 13:51 +0300 schrieb muradm:
> the only thing left behind is swaybar which relays on
> either systemd, elogind or basu for system tray functionality.
> this could be used as argument for keeping elogind
> as dependency.
I think the way forward would be to package basu and replace elogind
with it, rather than drop it and breaking swaybar.  WDYT?

[bug#56094] [PATCH] gnu: Remove unnecessary sway dependency on elogind.

[muradm]

Should be applied after #56136.

[bug#56094] [PATCH v2] gnu: wm: Switch sway from elogind to basu.

[muradm]

* gnu/packages/wm.scm (basu): Switch sway from elogind to basu.
[inputs]: Replace elogind with basu for sd-bus library dependency.
[arguments]: Use G-expressions.
<#:configure-flags>: Request building against basu.
---
 gnu/packages/wm.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index ecc79f73b9..7570e37239 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1572,7 +1572,8 @@ (define-public sway
         (base32 "0j4sdbsrlvky1agacc0pcz9bwmaxjmrapjnzscbd2i0cria2fc5j"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
+     `(#:configure-flags '("-Dsd-bus-provider=basu")
+       #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'hardcode-paths
            (lambda* (#:key inputs #:allow-other-keys)
@@ -1587,8 +1588,8 @@ (define-public sway
                 (string-append "'" (assoc-ref inputs "scdoc")
                                "/bin/scdoc'")))
              #t)))))
-    (inputs (list cairo
-                  elogind
+    (inputs (list basu
+                  cairo
                   gdk-pixbuf
                   json-c
                   libevdev
-- 
2.36.1

[bug#56094] [PATCH v2] gnu: wm: Switch sway from elogind to basu.

[Liliana Marie Prikler]

block 56094 by 56136
thanks

Am Mittwoch, dem 22.06.2022 um 12:27 +0300 schrieb muradm:
> * gnu/packages/wm.scm (basu): Switch sway from elogind to basu.
Should be sway.
> [inputs]: Replace elogind with basu for sd-bus library dependency.
This can be simplified to "Replace ‘elogind’ with ‘basu’."
> [arguments]: Use G-expressions.
Actually, you don't, and even if, that ought to be a separate commit.
> <#:configure-flags>: Request building against basu.
Is this necessary?  Doesn't sway have autodetection for basu?


Cheers

[bug#56094] [PATCH v2] gnu: wm: Switch sway from elogind to basu.

[muradm]

[-- Attachment #1: Type: text/plain, Size: 890 bytes --]


Next one reflecting changes.

Yes, necessary to state basu explicitly, meson.build detects
like systemd -> elogind -> basu. While removed from sway
dependencies, elogind still comes from dependencies of
dependencies.

--
muradm

Liliana Marie Prikler <liliana.prikler@ist.tugraz.at> writes:

> block 56094 by 56136
> thanks
>
> Am Mittwoch, dem 22.06.2022 um 12:27 +0300 schrieb muradm:
>> * gnu/packages/wm.scm (basu): Switch sway from elogind to basu.
> Should be sway.
>> [inputs]: Replace elogind with basu for sd-bus library 
>> dependency.
> This can be simplified to "Replace ‘elogind’ with ‘basu’."
>> [arguments]: Use G-expressions.
> Actually, you don't, and even if, that ought to be a separate 
> commit.
>> <#:configure-flags>: Request building against basu.
> Is this necessary?  Doesn't sway have autodetection for basu?
>
>
> Cheers


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#56094] [PATCH v2] gnu: wm: Switch sway from elogind to basu.

[Liliana Marie Prikler]

Am Mittwoch, dem 22.06.2022 um 12:38 +0300 schrieb muradm:
> Next one reflecting changes.
> 
> Yes, necessary to state basu explicitly, meson.build detects
> like systemd -> elogind -> basu. While removed from sway
> dependencies, elogind still comes from dependencies of
> dependencies.
We call that a transitive propagated input.  You should probably add a
comment that elogind "still exists" and justify your defensive
programming in there.

Cheers

[bug#56094] [PATCH v3] gnu: wm: Switch sway from elogind to basu.

[muradm]

* gnu/packages/wm.scm (sway): Replace ‘elogind’ with ‘basu’.
[inputs]: Replace ‘elogind’ with ‘basu’.
[arguments]:
<#:configure-flags>: Request building against basu.
`elogind` still exists as transitive propagated input,
while `meson.build` auto detects by probing `systemd`,
`elogind` and `basu` in respective order.
---
 gnu/packages/wm.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index ecc79f73b9..7570e37239 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1572,7 +1572,8 @@ (define-public sway
         (base32 "0j4sdbsrlvky1agacc0pcz9bwmaxjmrapjnzscbd2i0cria2fc5j"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
+     `(#:configure-flags '("-Dsd-bus-provider=basu")
+       #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'hardcode-paths
            (lambda* (#:key inputs #:allow-other-keys)
@@ -1587,8 +1588,8 @@ (define-public sway
                 (string-append "'" (assoc-ref inputs "scdoc")
                                "/bin/scdoc'")))
              #t)))))
-    (inputs (list cairo
-                  elogind
+    (inputs (list basu
+                  cairo
                   gdk-pixbuf
                   json-c
                   libevdev
-- 
2.36.1

[bug#56094] [PATCH v3] gnu: wm: Switch sway from elogind to basu.

[Liliana Marie Prikler]

Am Mittwoch, dem 22.06.2022 um 12:52 +0300 schrieb muradm:
> * gnu/packages/wm.scm (sway): Replace ‘elogind’ with ‘basu’.
> [inputs]: Replace ‘elogind’ with ‘basu’.
Collapse to (sway)[inputs].  No need to repeat yourself.
> [arguments]:
> <#:configure-flags>: Request building against basu.
Since we're at it, this should actually be "Add [the flag]".
> `elogind` still exists as transitive propagated input,
> while `meson.build` auto detects by probing `systemd`,
> `elogind` and `basu` in respective order.
In the source, not in the commit message :P
Can be shortened to "elogind is propagated by [input] and would
otherwise shadow basu".


Cheers

[bug#56094] [PATCH v4] gnu: wm: Switch sway from elogind to basu.

[muradm]

* gnu/packages/wm.scm (sway):
[inputs]: Replace ‘elogind’ with ‘basu’.
[arguments]: Add -Dsd-bus-provider=basu flag.
---
 gnu/packages/wm.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index ecc79f73b9..0ea7641db3 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1572,7 +1572,10 @@ (define-public sway
         (base32 "0j4sdbsrlvky1agacc0pcz9bwmaxjmrapjnzscbd2i0cria2fc5j"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
+     `(;; elogind is propagated by wlroots -> libseat
+       ;; and would otherwise shadow basu.
+       #:configure-flags '("-Dsd-bus-provider=basu")
+       #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'hardcode-paths
            (lambda* (#:key inputs #:allow-other-keys)
@@ -1587,8 +1590,8 @@ (define-public sway
                 (string-append "'" (assoc-ref inputs "scdoc")
                                "/bin/scdoc'")))
              #t)))))
-    (inputs (list cairo
-                  elogind
+    (inputs (list basu
+                  cairo
                   gdk-pixbuf
                   json-c
                   libevdev
-- 
2.36.1

[bug#56094] [PATCH v4] gnu: wm: Switch sway from elogind to basu.

[Liliana Marie Prikler]

Am Mittwoch, dem 22.06.2022 um 13:35 +0300 schrieb muradm:
> * gnu/packages/wm.scm (sway):
> [inputs]: Replace ‘elogind’ with ‘basu’.
> [arguments]: Add -Dsd-bus-provider=basu flag.
Tiny nitpick, should literally be “Add "-Dsd-bus-provider=basu"”
(see how quoting this is hard?)  You don't need to send a v5 though,
I'll just reword it once basu is ready.


Cheers