From 08dbc3b5503f6cbfcb5b131797a4deb55e91101b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 12 Nov 2014 18:55:33 +0100
Subject: [PATCH] services: xorg: Set argv[0] for the window manager.

* gnu/services/xorg.scm (xinitrc): Set argv[0] when invoking ratpoison
  or wmaker.
---
 gnu/services/xorg.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 9c075acd0f..2d25635bcb 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -148,11 +148,14 @@ EndSection
           (false-if-exception (execl file file)))
 
         ;; Then try a pre-configured session type.
-        (match (command-line)
-          ((_ "ratpoison")
-           (execl (string-append #$ratpoison "/bin/ratpoison")))
-          (_
-           (execl (string-append #$windowmaker "/bin/wmaker"))))))
+        (let ((ratpoison (string-append #$ratpoison "/bin/ratpoison"))
+              (wmaker    (string-append #$windowmaker "/bin/wmaker")))
+          (match (command-line)
+            ((_ "ratpoison")
+             (execl ratpoison ratpoison))
+            (_
+             ;; 'wmaker' does execvp(argv[0]), so we really can't mess up.
+             (execl wmaker wmaker))))))
 
   (gexp->script "xinitrc" builder))