aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-05-11 22:38:48 +0200
committerLudovic Courtès <ludo@gnu.org>2017-05-11 23:31:28 +0200
commitd5e7d014dd304474692e47a7d48d33e99b81e18a (patch)
treec4db888bca1c737e23c334a55d62aee57f5bff79
parent4ad8aed77f40ad35c8370a74666e3449034b546f (diff)
downloadguix-d5e7d014dd304474692e47a7d48d33e99b81e18a.tar
guix-d5e7d014dd304474692e47a7d48d33e99b81e18a.tar.gz
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.
-rw-r--r--gnu/packages/lxde.scm15
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index cc1156ae60..bf70bd6013 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.")