From 60b06fd4bf04fc9b172cd2d557be9237ffc6fd46 Mon Sep 17 00:00:00 2001 From: doncatnip Date: Fri, 2 Sep 2016 00:41:22 +0200 Subject: [PATCH 3/3] gnu: awesome: Update to 3.5.9. * gnu/packages/wm.scm (awesome): Update to 3.5.9. (awesome)[inputs]: Add gobject-introspection, lua-lgi, cairo. Use latest available lua. (awesome)[arguments]: Set lua search paths. Add cairo to LD_LIBRARY_PATH. Wrap binary in respect to those paths plus GI_TYPELIB_PATH. --- gnu/packages/wm.scm | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2cc9f44..ee67c6d 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Carlo Zancanaro ;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2016 doncatnip ;;; ;;; This file is part of GNU Guix. ;;; @@ -382,7 +383,7 @@ experience.") (define-public awesome (package (name "awesome") - (version "3.4.15") + (version "3.5.9") (source (origin (method url-fetch) (uri (string-append @@ -390,7 +391,7 @@ experience.") version ".tar.xz")) (sha256 (base32 - "1m910lr7wkw2dgzmirfvz7dasfswhhccdf65l21iiciv24c3w1bb")) + "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67")) (modules '((guix build utils) (srfi srfi-19))) (snippet @@ -413,7 +414,9 @@ experience.") ("libxml2" ,libxml2) ;for XML_CATALOG_FILES ("pkg-config" ,pkg-config) ("xmlto" ,xmlto))) - (inputs `(("cairo" ,cairo) + (inputs `(("gobject-introspection" ,gobject-introspection) + ("lua-lgi",lua-lgi) + ("cairo" ,cairo) ("dbus" ,dbus) ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) @@ -422,7 +425,7 @@ experience.") ("libxcb" ,libxcb) ("libxcursor" ,libxcursor) ("libxdg-basedir" ,libxdg-basedir) - ("lua" ,lua-5.1) + ("lua" ,lua) ("pango" ,pango) ("startup-notification" ,startup-notification) ("xcb-util" ,xcb-util) @@ -445,11 +448,35 @@ experience.") (("/xmlto") (string-append "/xmlto --skip-validation"))) #t)) + (add-before 'configure 'set-lua-paths + (lambda* (#:key inputs #:allow-other-keys) + ; needs to load cairo dynamically + (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"))))) (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"))))))) + (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") (description "awesome is a window manager for X. It manages windows in different -- 2.9.3