[PATCH] services: xorg-wrapper: Support xorg server input

Done

Details

4 participants

???
Ludovic Courtès
Roman Scherer
Roman Scherer

Owner: unassigned

Submitted by: Roman Scherer

Severity: normal

Roman Scherer wrote on 12 Feb 2023 19:52

Recipients:(name . Guix Patches)(address . guix-patches@gnu.org)

Message-ID:86k00mvgmi.fsf@burningswell.com

Hello Guix,

I would like to replace the Mesa package in my Xorg configuration. I

tried to do this with the following snippet:

```

(modify-services %desktop-services

(slim-service-type config =>

(slim-configuration

(inherit config)

(xorg-configuration

(server (replace-mesa xorg-server)))))))

```

But this unfortunately does not work, because the xorg-wrapper uses

static paths for the mesa, xkbcomp and xkeyboard-config packages in the

derivation.

The xserver starts now with the replaced mesa, but some paths still

point to the hard coded packages in Guix itself (and not the

replacement), which cause some things to not work.

This patch changes this to lookup the paths from the inputs of the

server field of the xorg-configuration instead. That way the correct

paths are setup in the xor-wrapper script. If those inputs are not found

for some reason it falls back to the current behavior, using the

packages from Guix.

Could you please review this?

Thanks, Roman.

From d035c99ed4703da0e3e9b62299c390560c074a17 Mon Sep 17 00:00:00 2001
From: r0man <roman@burningswell.com>
Date: Sat, 11 Feb 2023 19:36:16 +0100
Subject: [PATCH] services: xorg-wrapper: Support xorg server input
 transformations.

* gnu/services/xorg.scm (xorg-wrapper): Support xorg server input transformations.
---
 gnu/services/xorg.scm | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 5f073d05d3..92735e6004 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -355,6 +355,21 @@ (define files
                                  files)
                        #t))))
 
+(define (xorg-configuration-append-input config input default-input path)
+  (let ((server (xorg-configuration-server config)))
+    (file-append (or (lookup-package-direct-input server input) default-input)
+                 path)))
+
+(define (xorg-configuration-dri-driver-path config)
+  (xorg-configuration-append-input config "mesa" mesa "/lib/dri"))
+
+(define (xorg-configuration-xkb-bin-dir config)
+  (xorg-configuration-append-input config "xkbcomp" xkbcomp "/bin"))
+
+(define (xorg-configuration-xkb-dir config)
+  (xorg-configuration-append-input config "xkeyboard-config"
+                                   xkeyboard-config "/share/X11/xkb"))
+
 (define* (xorg-wrapper #:optional (config (xorg-configuration)))
   "Return a derivation that builds a script to start the X server with the
 given @var{config}.  The resulting script should be used in place of
@@ -362,12 +377,13 @@ (define* (xorg-wrapper #:optional (config (xorg-configuration)))
   (define exp
     ;; Write a small wrapper around the X server.
     #~(begin
-        (setenv "XORG_DRI_DRIVER_PATH" (string-append #$mesa "/lib/dri"))
-        (setenv "XKB_BINDIR" (string-append #$xkbcomp "/bin"))
+        (setenv "XORG_DRI_DRIVER_PATH"
+                #$(xorg-configuration-dri-driver-path config))
+        (setenv "XKB_BINDIR" #$(xorg-configuration-xkb-bin-dir config))
 
         (let ((X (string-append #$(xorg-configuration-server config) "/bin/X")))
           (apply execl X X
-                 "-xkbdir" (string-append #$xkeyboard-config "/share/X11/xkb")
+                 "-xkbdir" #$(xorg-configuration-xkb-dir config)
                  "-config" #$(xorg-configuration->file config)
                  "-configdir" #$(xorg-configuration-directory
                                  (xorg-configuration-modules config))
-- 
2.38.1

??? wrote on 7 Mar 2023 02:30

Recipients:(name . Roman Scherer)(address . roman.scherer@burningswell.com)(address . 61458@debbugs.gnu.org)

Message-ID:871qm1nyau.fsf@envs.net

Roman Scherer <roman.scherer@burningswell.com> writes:

Toggle quote (33 lines)> Hello Guix,
>
> I would like to replace the Mesa package in my Xorg configuration. I
> tried to do this with the following snippet:
>
> ```
> (modify-services %desktop-services
>   (slim-service-type config =>
>                      (slim-configuration
>                       (inherit config)
>                       (xorg-configuration
>                        (xorg-configuration
>                         (server (replace-mesa xorg-server)))))))
> ```
>
> But this unfortunately does not work, because the xorg-wrapper uses
> static paths for the mesa, xkbcomp and xkeyboard-config packages in the
> derivation.
>
> The xserver starts now with the replaced mesa, but some paths still
> point to the hard coded packages in Guix itself (and not the
> replacement), which cause some things to not work.
>
> This patch changes this to lookup the paths from the inputs of the
> server field of the xorg-configuration instead. That way the correct
> paths are setup in the xor-wrapper script. If those inputs are not found
> for some reason it falls back to the current behavior, using the
> packages from Guix.
>
> Could you please review this?
>
> Thanks, Roman.

Sorry for a long deley..

Toggle quote (7 lines)

> From d035c99ed4703da0e3e9b62299c390560c074a17 Mon Sep 17 00:00:00 2001

> From: r0man <roman@burningswell.com>

> Date: Sat, 11 Feb 2023 19:36:16 +0100

> Subject: [PATCH] services: xorg-wrapper: Support xorg server input

> transformations.

I think it's better add some explaination to commit message like:

The xorg-wrapper uses [...]

This patch [...]

Should be good.

Toggle quote (18 lines)>
> * gnu/services/xorg.scm (xorg-wrapper): Support xorg server input transformations.
> ---
>  gnu/services/xorg.scm | 22 +++++++++++++++++++---
>  1 file changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
> index 5f073d05d3..92735e6004 100644
> --- a/gnu/services/xorg.scm
> +++ b/gnu/services/xorg.scm
> @@ -355,6 +355,21 @@ (define files
>                                   files)
>                         #t))))
>  
> +(define (xorg-configuration-append-input config input default-input path)
> +  (let ((server (xorg-configuration-server config)))
> +    (file-append (or (lookup-package-direct-input server input) default-input)
> +                 path)))

I'm not sure about the procedure name, maybe add a docstring explain

it's function?

Otherwise, look good to me, thank you!

Roman Scherer wrote on 10 Mar 2023 16:32

Recipients:(name . ???)(address . iyzsong@envs.net)(address . 61458@debbugs.gnu.org)

Message-ID:86o7p039kj.fsf@burningswell.com

Hi ???,

thanks for taking a look. I messed up my system, but will update the

patch once I got everyting working again.

Roman

??? <iyzsong@envs.net> writes:

Toggle quote (71 lines)> Roman Scherer <roman.scherer@burningswell.com> writes:
>
>> Hello Guix,
>>
>> I would like to replace the Mesa package in my Xorg configuration. I
>> tried to do this with the following snippet:
>>
>> ```
>> (modify-services %desktop-services
>>   (slim-service-type config =>
>>                      (slim-configuration
>>                       (inherit config)
>>                       (xorg-configuration
>>                        (xorg-configuration
>>                         (server (replace-mesa xorg-server)))))))
>> ```
>>
>> But this unfortunately does not work, because the xorg-wrapper uses
>> static paths for the mesa, xkbcomp and xkeyboard-config packages in the
>> derivation.
>>
>> The xserver starts now with the replaced mesa, but some paths still
>> point to the hard coded packages in Guix itself (and not the
>> replacement), which cause some things to not work.
>>
>> This patch changes this to lookup the paths from the inputs of the
>> server field of the xorg-configuration instead. That way the correct
>> paths are setup in the xor-wrapper script. If those inputs are not found
>> for some reason it falls back to the current behavior, using the
>> packages from Guix.
>>
>> Could you please review this?
>>
>> Thanks, Roman.
>
> Sorry for a long deley..
>>
>> From d035c99ed4703da0e3e9b62299c390560c074a17 Mon Sep 17 00:00:00 2001
>> From: r0man <roman@burningswell.com>
>> Date: Sat, 11 Feb 2023 19:36:16 +0100
>> Subject: [PATCH] services: xorg-wrapper: Support xorg server input
>>  transformations.
>
> I think it's better add some explaination to commit message like:
> The xorg-wrapper uses [...]
> This patch [...]
>
> Should be good.
>>
>> * gnu/services/xorg.scm (xorg-wrapper): Support xorg server input transformations.
>> ---
>>  gnu/services/xorg.scm | 22 +++++++++++++++++++---
>>  1 file changed, 19 insertions(+), 3 deletions(-)
>>
>> diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
>> index 5f073d05d3..92735e6004 100644
>> --- a/gnu/services/xorg.scm
>> +++ b/gnu/services/xorg.scm
>> @@ -355,6 +355,21 @@ (define files
>>                                   files)
>>                         #t))))
>>
>> +(define (xorg-configuration-append-input config input default-input path)
>> +  (let ((server (xorg-configuration-server config)))
>> +    (file-append (or (lookup-package-direct-input server input) default-input)
>> +                 path)))
> I'm not sure about the procedure name, maybe add a docstring explain
> it's function?
>
>
> Otherwise, look good to me, thank you!

Ludovic Courtès wrote on 16 Mar 2023 12:05

control message for bug #61458

Recipients:(address . control@debbugs.gnu.org)

Message-ID:877cvhgdmh.fsf@gnu.org

tags 61458 + moreinfo

quit

Roman Scherer wrote on 21 Mar 2023 20:11

[PATCH v2 0/1] Support xorg server input rewriting

Recipients:(address . 61458@debbugs.gnu.org)

Message-ID:cover.1679425545.git.roman@burningswell.com

Hi ???,

I'm back on track. Here's an improved version of the patch. It was indeed way

too complicated. :)

Can you have another look please?

Thanks, Roman.

r0man (1):

services: xorg-wrapper: Support xorg server input rewriting.

gnu/services/xorg.scm | 23 ++++++++++++++++++++---

1 file changed, 20 insertions(+), 3 deletions(-)

2.39.1

Roman Scherer wrote on 21 Mar 2023 20:11

[PATCH v2 1/1] services: xorg-wrapper: Support xorg server input rewriting.

Recipients:(address . 61458@debbugs.gnu.org)

Message-ID:af690c2b48f456fda57a00bb2622b571df15aec9.1679425545.git.roman@burningswell.com

* gnu/services/xorg.scm (xorg-wrapper): Support xorg server input rewriting.

This patch adds support for proper xorg server input rewriting. It uses the

lookup-package-direct-input procedure to configure the X server paths

dynamically, instead of always using the hard coded package. Something like

this is now possible:

(define other-mesa

(package-input-rewriting/spec `(("mesa" . ,(const other-mesa)))))

(xorg-configuration

(server (other-mesa xorg-server))))

Without this patch the X server would still be configured with mesa (causing

version issues), and not with other-mesa (as per the input rewrite).

---

gnu/services/xorg.scm | 23 ++++++++++++++++++++---

1 file changed, 20 insertions(+), 3 deletions(-)

Toggle diff (46 lines)diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index c4745cecf5..7295a45b59 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -358,6 +358,22 @@ (define (xorg-configuration-directory modules)
                                  files)
                        #t))))
 
+(define (xorg-configuration-server-package-path config input path)
+  "Lookup the direct @var{input} in the xorg server package of @var{config}
+and append @var{path} to it."
+  (let* ((server (xorg-configuration-server config))
+         (package (lookup-package-direct-input server input)))
+    (when package (file-append package path))))
+
+(define (xorg-configuration-dri-driver-path config)
+  (xorg-configuration-server-package-path config "mesa" "/lib/dri"))
+
+(define (xorg-configuration-xkb-bin-dir config)
+  (xorg-configuration-server-package-path config "xkbcomp" "/bin"))
+
+(define (xorg-configuration-xkb-dir config)
+  (xorg-configuration-server-package-path config "xkeyboard-config" "/share/X11/xkb"))
+
 (define* (xorg-wrapper #:optional (config (xorg-configuration)))
   "Return a derivation that builds a script to start the X server with the
 given @var{config}.  The resulting script should be used in place of
@@ -365,12 +381,13 @@ (define* (xorg-wrapper #:optional (config (xorg-configuration)))
   (define exp
     ;; Write a small wrapper around the X server.
     #~(begin
-        (setenv "XORG_DRI_DRIVER_PATH" (string-append #$mesa "/lib/dri"))
-        (setenv "XKB_BINDIR" (string-append #$xkbcomp "/bin"))
+        (setenv "XORG_DRI_DRIVER_PATH"
+                #$(xorg-configuration-dri-driver-path config))
+        (setenv "XKB_BINDIR" #$(xorg-configuration-xkb-bin-dir config))
 
         (let ((X (string-append #$(xorg-configuration-server config) "/bin/X")))
           (apply execl X X
-                 "-xkbdir" (string-append #$xkeyboard-config "/share/X11/xkb")
+                 "-xkbdir" #$(xorg-configuration-xkb-dir config)
                  "-config" #$(xorg-configuration->file config)
                  "-configdir" #$(xorg-configuration-directory
                                  (xorg-configuration-modules config))
-- 
2.39.1

??? wrote on 25 Mar 2023 03:11

Re: bug#61458: [PATCH] services: xorg-wrapper: Support xorg server input

Recipients:(name . Roman Scherer)(address . roman@burningswell.com)(address . 61458-done@debbugs.gnu.org)

Message-ID:871qldinrb.fsf_-_@envs.net

Roman Scherer <roman@burningswell.com> writes:

Toggle quote (2 lines)

> services: xorg-wrapper: Support xorg server input rewriting.

Pushed with some commit description added:

* gnu/services/xorg.scm (xorg-configuration-server-package-path)

(xorg-configuration-dri-driver-path, xorg-configuration-xkb-bin-dir)

(xorg-configuration-xkb-dir): New procedures.

(xorg-wrapper): Use them for dri and xkb paths.

Thank you!

Closed

Roman Scherer wrote on 25 Mar 2023 08:56

Recipients:(name . ???)(address . iyzsong@envs.net)(address . 61458-done@debbugs.gnu.org)

Message-ID:86y1nl462b.fsf@burningswell.com

Thank you ???!

??? <iyzsong@envs.net> writes:

Toggle quote (12 lines)> Roman Scherer <roman@burningswell.com> writes:
>
>>   services: xorg-wrapper: Support xorg server input rewriting.
>
> Pushed with some commit description added:
>
>     * gnu/services/xorg.scm (xorg-configuration-server-package-path)
>     (xorg-configuration-dri-driver-path, xorg-configuration-xkb-bin-dir)
>     (xorg-configuration-xkb-dir): New procedures.
>     (xorg-wrapper): Use them for dri and xkb paths.
>
> Thank you!

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 61458@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date