emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[debbugs-tracker] bug#31005: closed ([PATCH] gnu: Add x11-socket-dir-ser


From: GNU bug Tracking System
Subject: [debbugs-tracker] bug#31005: closed ([PATCH] gnu: Add x11-socket-dir-service)
Date: Wed, 04 Apr 2018 11:37:02 +0000

Your message dated Wed, 04 Apr 2018 13:36:10 +0200
with message-id <address@hidden>
and subject line Re: [bug#31005] [PATCH] gnu: Add x11-socket-dir-service
has caused the debbugs.gnu.org bug report #31005,
regarding [PATCH] gnu: Add x11-socket-dir-service
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
31005: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=31005
GNU Bug Tracking System
Contact address@hidden with problems
--- Begin Message --- Subject: [PATCH] gnu: Add x11-socket-dir-service Date: Sat, 31 Mar 2018 14:34:50 +0200 User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0
* gnu/services/desktop.scm (gnu): Export x11-socket-dir-service, define it,
  add it to %desktop-services list.
---
 gnu/services/desktop.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 897252917..ef3a5457e 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -94,6 +94,8 @@
             xfce-desktop-service
             xfce-desktop-service-type

+            x11-socket-dir-service
+
             %desktop-services))

 ;;; Commentary:
@@ -882,6 +884,21 @@ with the administrator's password."

 
 ;;;
+;;; X11 socket directory service
+;;;
+
+(define x11-socket-dir-service
+  ;; Return a service that creates /tmp/.X11-unix. X11 servers, including
+  ;; XWayland, create their socket file there.
+  (simple-service 'x11-socket-dir
+                  activation-service-type
+                  #~(begin (use-modules (guix build utils))
+                           (let ((p "/tmp/.X11-unix"))
+                             (mkdir-p p)
+                             (chmod p #o777)))))
+
+
+;;;
 ;;; The default set of desktop services.
 ;;;

@@ -912,6 +929,8 @@ with the administrator's password."

          (ntp-service)

+         x11-socket-dir-service
+
          %base-services))

 ;;; desktop.scm ends here
--
2.11.0



--- End Message ---
--- Begin Message --- Subject: Re: [bug#31005] [PATCH] gnu: Add x11-socket-dir-service Date: Wed, 04 Apr 2018 13:36:10 +0200 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)
Hi Thorsten,

Thorsten Wilms <address@hidden> skribis:

> * gnu/services/desktop.scm (gnu): Export x11-socket-dir-service, define it,
>   add it to %desktop-services list.

I made the following cosmetic changes and committed.

Thanks!

Ludo’.

diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 7f2d10d90..517d5d3ef 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -94,7 +94,7 @@
             xfce-desktop-service
             xfce-desktop-service-type
 
-            x11-socket-dir-service
+            x11-socket-directory-service
 
             %desktop-services))
 
@@ -887,15 +887,18 @@ with the administrator's password."
 ;;; X11 socket directory service
 ;;;
 
-(define x11-socket-dir-service
-  ;; Return a service that creates /tmp/.X11-unix. X11 servers, including
-  ;; XWayland, create their socket file there.
-  (simple-service 'x11-socket-dir
+(define x11-socket-directory-service
+  ;; Return a service that creates /tmp/.X11-unix.  When using X11, libxcb
+  ;; takes care of creating that directory.  However, when using XWayland, we
+  ;; need to create beforehand.  Thus, create it unconditionally here.
+  (simple-service 'x11-socket-directory
                   activation-service-type
-                  #~(begin (use-modules (guix build utils))
-                           (let ((p "/tmp/.X11-unix"))
-                             (mkdir-p p)
-                             (chmod p #o777)))))
+                  (with-imported-modules '((guix build utils))
+                    #~(begin
+                        (use-modules (guix build utils))
+                        (let ((directory "/tmp/.X11-unix"))
+                          (mkdir-p directory)
+                          (chmod directory #o777))))))
 
 
 ;;;
@@ -929,7 +932,7 @@ with the administrator's password."
 
          (ntp-service)
 
-         x11-socket-dir-service
+         x11-socket-directory-service
 
          %base-services))
 

--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]