branch master updated: gnu: lxrandr: Depend on xrandr.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

nckx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new e668518  gnu: lxrandr: Depend on xrandr.
e668518 is described below

commit e6685186a5bbd5fecde4b4daa9d60eee35d2c783
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Jun 26 22:05:08 2020 +0200

    gnu: lxrandr: Depend on xrandr.
    
    * gnu/packages/lxde.scm (lxrandr)[arguments]: Substitute xrandr's
    absolute file name.
    
    Reported by pinoaffe on #guix.
---
 gnu/packages/lxde.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index fbf32bf..cad5282 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -137,7 +137,19 @@ able to change themes, icons, and fonts used by GTK+ 
applications.")
                (base32
                 "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb"))))
     (build-system gnu-build-system)
-    (inputs `(("gtk+" ,gtk+-2)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'xrandr-absolutely
+           ;; lxrandr is useless without xrandr and gives an unhelpful error
+           ;; message if it's not in $PATH, so make it a hard dependency.
+           (lambda* (#:key input #:allow-other-keys)
+             (substitute* "src/lxrandr.c"
+               (("(\"|')xrandr\"" _ match)
+                (string-append match (which "xrandr") "\"")))
+             #t)))))
+    (inputs `(("gtk+" ,gtk+-2)
+              ("xrandr" ,xrandr)))
     (native-inputs `(("intltool"   ,intltool)
                      ("pkg-config" ,pkg-config)))
     (synopsis "LXDE monitor configuration tool")