34/40: gnu: awesome: Add 'bash' input for 'wrap-program'.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 65eb466c9225da51b904ac92d741e1f6dbde71cd
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Jul 2 12:07:04 2021 +0200

    gnu: awesome: Add 'bash' input for 'wrap-program'.
    
    It is required for cross-compilation.
    
    * gnu/packages/wm.scm (awesome): Delete trailing #t.
    [inputs]: Add 'bash-minimal'.
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
    Change-Id: I3dd64b3ddc2884bd269ec5d07a58ef8944e848ff
---
 gnu/packages/wm.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 4dcdc18df9..22f1241060 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1210,7 +1210,8 @@ for wlroots-based Wayland compositors.")
            pkg-config
            xmlto))
     (inputs
-     (list cairo
+     (list bash-minimal
+           cairo
            dbus
            gdk-pixbuf
            glib
@@ -1291,8 +1292,7 @@ for wlroots-based Wayland compositors.")
              (let* ((out (assoc-ref outputs "out"))
                     (awesome (string-append out "/bin/awesome")))
                (substitute* (string-append out 
"/share/xsessions/awesome.desktop")
-                 (("Exec=awesome") (string-append "Exec=" awesome)))
-               #t)))
+                 (("Exec=awesome") (string-append "Exec=" awesome))))))
          (add-after 'install 'wrap
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((awesome (assoc-ref outputs "out"))
@@ -1305,8 +1305,7 @@ for wlroots-based Wayland compositors.")
                  `("LUA_CPATH" ";" suffix
                    (,(format #f "~a/lib/lua/~a/?.so" lua-lgi lua-version)))
                  `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))
-                 `("LD_LIBRARY_PATH" suffix (,cairo)))
-               #t))))))
+                 `("LD_LIBRARY_PATH" suffix (,cairo)))))))))
     (home-page "https://awesomewm.org/";)
     (synopsis "Highly configurable window manager")
     (description