ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 13:09:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: awesome: Update to 3.5.9.

Browse source 
* gnu/packages/wm.scm (awesome): Update to 3.5.9.
[inputs]: Add gobject-introspection, lua-lgi, cairo. Use latest available lua.
[arguments]: Set lua search paths. Add cairo to LD_LIBRARY_PATH. Wrap binary in
respect to those paths plus GI_TYPELIB_PATH.
This commit is contained in:
doncatnip 2016-09-20 14:02:53 -04:00 committed by Leo Famulari
parent 03d8505f14
commit 22037a327a
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
1 changed files with 46 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
gnu/packages/wm.scm
View file

@ -10,6 +10,7 @@
;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -383,7 +384,7 @@ (define-public fluxbox
(define-public awesome (define-public awesome
(package (package
(name "awesome") (name "awesome")
(version "3.4.15") (version "3.5.9")
(source (source
(origin (method url-fetch) (origin (method url-fetch)
(uri (string-append (uri (string-append
@ -391,7 +392,7 @@ (define-public awesome
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1m910lr7wkw2dgzmirfvz7dasfswhhccdf65l21iiciv24c3w1bb")) "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67"))
(modules '((guix build utils) (modules '((guix build utils)
(srfi srfi-19))) (srfi srfi-19)))
(snippet (snippet
@ -418,12 +419,14 @@ (define-public awesome
("dbus" ,dbus) ("dbus" ,dbus)
("gdk-pixbuf" ,gdk-pixbuf) ("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib) ("glib" ,glib)
("gobject-introspection" ,gobject-introspection)
("imlib2" ,imlib2) ("imlib2" ,imlib2)
("libev" ,libev) ("libev" ,libev)
("libxcb" ,libxcb) ("libxcb" ,libxcb)
("libxcursor" ,libxcursor) ("libxcursor" ,libxcursor)
("libxdg-basedir" ,libxdg-basedir) ("libxdg-basedir" ,libxdg-basedir)
("lua" ,lua-5.1) ("lua" ,lua)
("lua-lgi",lua-lgi)
("pango" ,pango) ("pango" ,pango)
("startup-notification" ,startup-notification) ("startup-notification" ,startup-notification)
("xcb-util" ,xcb-util) ("xcb-util" ,xcb-util)
@ -437,20 +440,46 @@ (define-public awesome
;; '--no-name' is used, which removes timestamps from gzip output. ;; '--no-name' is used, which removes timestamps from gzip output.
#:configure-flags '("-DCOMPRESS_MANPAGES=off") #:configure-flags '("-DCOMPRESS_MANPAGES=off")
#:phases (modify-phases %standard-phases #:phases
(add-before 'build 'xmlto-skip-validation (modify-phases %standard-phases
(lambda _ (add-before 'build 'xmlto-skip-validation
;; We can't download the necessary schema, so so skip (lambda _
;; validation and assume they're valid. ;; We can't download the necessary schema, so so skip
(substitute* "../build/CMakeFiles/man.dir/build.make" ;; validation and assume they're valid.
(("/xmlto") (substitute* "../build/CMakeFiles/man.dir/build.make"
(string-append "/xmlto --skip-validation"))) (("/xmlto")
#t)) (string-append "/xmlto --skip-validation")))
(replace 'check #t))
(lambda _ (add-before 'configure 'set-lua-paths
;; There aren't any tests, so just make sure the binary (lambda* (#:key inputs #:allow-other-keys)
;; gets built and can be run successfully. ;; The build process needs to load cairo dynamically.
(zero? (system* "../build/awesome" "-v"))))))) (let* ((cairo (string-append
(assoc-ref inputs "cairo") "/lib" ))
(lua-lgi (assoc-ref inputs "lua-lgi") ))
(setenv "LD_LIBRARY_PATH" cairo )
(setenv "LUA_PATH" (string-append lua-lgi
"/share/lua/5.2/?.lua"))
(setenv "LUA_CPATH" (string-append lua-lgi
"/lib/lua/5.2/?.so"))
#t)))
(replace 'check
(lambda _
;; There aren't any tests, so just make sure the binary
;; gets built and can be run successfully.
(zero? (system* "../build/awesome" "-v"))))
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((awesome (assoc-ref outputs "out"))
(cairo (string-append
(assoc-ref inputs "cairo") "/lib" ))
(lua-lgi (assoc-ref inputs "lua-lgi") ))
(wrap-program (string-append awesome "/bin/awesome")
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))
`("LD_LIBRARY_PATH" suffix (, cairo))
`("LUA_PATH" suffix (,(string-append lua-lgi
"/share/lua/5.2/?.lua")))
`("LUA_CPATH" suffix (,(string-append
lua-lgi "/lib/lua/5.2/?.so"))))))))))
(synopsis "Highly configurable window manager") (synopsis "Highly configurable window manager")
(description (description
"Awesome has been designed as a framework window manager. It is fast, small, "Awesome has been designed as a framework window manager. It is fast, small,