ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Maxime Devos 2021-07-02 12:07:04 +02:00 committed by Ludovic Courtès
parent 69814c9229
commit 8f710be89e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/wm.scm
View file

@ -1230,7 +1230,8 @@ (define-public awesome
pkg-config pkg-config
xmlto)) xmlto))
(inputs (inputs
(list cairo (list bash-minimal
cairo
dbus dbus
gdk-pixbuf gdk-pixbuf
glib glib
@ -1311,8 +1312,7 @@ (define-public awesome
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(awesome (string-append out "/bin/awesome"))) (awesome (string-append out "/bin/awesome")))
(substitute* (string-append out "/share/xsessions/awesome.desktop") (substitute* (string-append out "/share/xsessions/awesome.desktop")
(("Exec=awesome") (string-append "Exec=" awesome))) (("Exec=awesome") (string-append "Exec=" awesome))))))
#t)))
(add-after 'install 'wrap (add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((awesome (assoc-ref outputs "out")) (let* ((awesome (assoc-ref outputs "out"))
@ -1325,8 +1325,7 @@ (define-public awesome
`("LUA_CPATH" ";" suffix `("LUA_CPATH" ";" suffix
(,(format #f "~a/lib/lua/~a/?.so" lua-lgi lua-version))) (,(format #f "~a/lib/lua/~a/?.so" lua-lgi lua-version)))
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))
`("LD_LIBRARY_PATH" suffix (,cairo))) `("LD_LIBRARY_PATH" suffix (,cairo)))))))))
#t))))))
(home-page "https://awesomewm.org/") (home-page "https://awesomewm.org/")
(synopsis "Highly configurable window manager") (synopsis "Highly configurable window manager")
(description (description