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

gnu: i3-wm: Update to 4.13.

Browse source 
* gnu/packages/wm.scm (i3-wm): Update to 4.13.
[arguments]: Pass '-std=c11' to #:make-flags. Provide path to XML_CATALOG_FILES.
Pass '--disable-builddir' to #:configure-flags. Re-enable the 'configure' phase
to adjust to new Autotools build system.
[inputs]: Add xcb-util-xrm.
[native-inputs]: Add docbook-xsl.
This commit is contained in:
Leo Famulari 2016-12-04 17:39:00 -05:00
parent 81f4f1051f
commit 4bd391f557
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
1 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gnu/packages/wm.scm
View file

@ -162,27 +162,49 @@ (define-public i3status
(define-public i3-wm (define-public i3-wm
(package (package
(name "i3-wm") (name "i3-wm")
(version "4.12") (version "4.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://i3wm.org/downloads/i3-" (uri (string-append "https://i3wm.org/downloads/i3-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1d3q3lgpjbkmcwzjhp0dfr0jq847silcfg087slcnj95ikh1r7p1")))) "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) `(#:make-flags
#:phases (let* ((docbook-xsl-name-version ,(string-append
(modify-phases %standard-phases (package-name docbook-xsl) "-"
(delete 'configure)) (package-version docbook-xsl)))
#:tests? #f)) ; no test suite (docbook-xsl-catalog-file (string-append
(assoc-ref %build-inputs "docbook-xsl")
"/xml/xsl/"
docbook-xsl-name-version
"/catalog.xml"))
(docbook-xml-catalog-file (string-append
(assoc-ref %build-inputs "docbook-xml")
"/xml/dtd/docbook/catalog.xml")))
;; Reference the catalog files required to build the manpages.
(list (string-append "XML_CATALOG_FILES=" docbook-xsl-catalog-file " "
docbook-xml-catalog-file)
"CC=gcc"
(string-append "PREFIX=" %output)
;; This works around the following error:
;; 'error: ‘for’ loop initial declarations are only allowed in C99
;; or C11 mode'
"CFLAGS=-std=c11"))
;; The build system tries to build in a separate directory, but that
;; seems to be unnecessary.
#:configure-flags '("--disable-builddir")
;; The test suite appears to require the unpackaged Perl module AnyEvent.
#:tests? #f))
(inputs (inputs
`(("libxcb" ,libxcb) `(("libxcb" ,libxcb)
("xcb-util" ,xcb-util) ("xcb-util" ,xcb-util)
("xcb-util-cursor" ,xcb-util-cursor) ("xcb-util-cursor" ,xcb-util-cursor)
("xcb-util-keysyms" ,xcb-util-keysyms) ("xcb-util-keysyms" ,xcb-util-keysyms)
("xcb-util-wm" ,xcb-util-wm) ("xcb-util-wm" ,xcb-util-wm)
("xcb-util-xrm" ,xcb-util-xrm)
("libxkbcommon" ,libxkbcommon) ("libxkbcommon" ,libxkbcommon)
("libev" ,libev) ("libev" ,libev)
("libyajl" ,libyajl) ("libyajl" ,libyajl)
@ -198,7 +220,9 @@ (define-public i3-wm
(native-inputs (native-inputs
`(("which" ,which) `(("which" ,which)
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)
;; For building the documentation.
("docbook-xsl" ,docbook-xsl)))
(home-page "https://i3wm.org/") (home-page "https://i3wm.org/")
(synopsis "Improved tiling window manager") (synopsis "Improved tiling window manager")
(description "A tiling window manager, completely written (description "A tiling window manager, completely written