01/02: gnu: lxde-common: Provide 'startlxde' with the 'lxsession' file name.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit d5e7d014dd304474692e47a7d48d33e99b81e18a
Author: Ludovic Courtès <address@hidden>
Date:   Thu May 11 22:38:48 2017 +0200

    gnu: lxde-common: Provide 'startlxde' with the 'lxsession' file name.
    
    Fixes <https://bugs.gnu.org/26688>.
    
    * gnu/packages/lxde.scm (lxde-common)[arguments, inputs]: New fields.
---
 gnu/packages/lxde.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index cc1156a..bf70bd6 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -289,11 +289,26 @@ menu spec-compliant desktop menus for LXDE.")
         (base32
          "0mj84fa3f4ak1jjslrwc2q3ci9zxrxpciggviza9bjb0168brn8w"))))
     (build-system gnu-build-system)
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (add-before 'configure 'set-lxsession
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      ;; Set the right file name for 'lxsession'.
+                      (let ((lxsession (assoc-ref inputs "lxsession")))
+                        (substitute* "startlxde.in"
+                          (("^exec .*/bin/lxsession")
+                           (string-append "exec " lxsession
+                                          "/bin/lxsession")))
+                        #t))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
        ("lxmenu-data" ,lxmenu-data)
        ("lxde-icon-theme" ,lxde-icon-theme)))
+    (inputs
+     `(("lxsession" ,lxsession)
+       ;; ("lxlock" ,lxlock) ;for 'lxde-screenlock.desktop'
+       ))
     (synopsis "Common files of the LXDE Desktop")
     (description
      "Lxde-common provides common files of the LXDE Desktop.")