me
/
guix
Archived
1
0
Fork 0
Code

gnu: conky: Update to 1.10.7. 

* gnu/packages/conky.scm (conky): Update to 1.10.7.
[arguments]: Use pkg-config to find ncurses.
[inputs]: Add imlib2 and libxext.
master
Tobias Geerinckx-Rice 2018-01-26 00:58:19 +01:00
parent 187e4a4b6d
commit c92f98ad51
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/conky.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu> ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,15 +25,16 @@
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages ncurses) #:use-module (gnu packages image)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
(define-public conky (define-public conky
(package (package
(name "conky") (name "conky")
(version "1.10.6") (version "1.10.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -40,15 +42,12 @@
version ".tar.gz")) version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "1jk0my7z45vz9vd8958d27nkk4kvr53k7wyf6cz2x9xjc0lri02c")))) (base32 "1b06rigfjxnaidkabkyf8mdh9k3jm11nj547lb5liwi2ql4rdfr3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; there are no tests `(#:tests? #f ; there are no tests
#:configure-flags #:configure-flags
'("-DRELEASE=true" (list "-DRELEASE=true")
;; XXX: it checks ncurses with pkg-config.
;; TODO: add 'ncurses.pc' to the ncurses package.
"-DBUILD_NCURSES=false")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'add-freetype-to-search-path (add-after 'unpack 'add-freetype-to-search-path
@ -67,12 +66,14 @@
#t))))) #t)))))
(inputs (inputs
`(("freetype" ,freetype) `(("freetype" ,freetype)
("ncurses" ,ncurses) ("imlib2" ,imlib2)
("libx11" ,libx11) ("libx11" ,libx11)
("libxdamage" ,libxdamage) ("libxdamage" ,libxdamage)
("libxext" ,libxext)
("libxft" ,libxft) ("libxft" ,libxft)
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("lua" ,lua))) ("lua" ,lua)
("ncurses" ,ncurses)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(home-page "https://github.com/brndnmtthws/conky") (home-page "https://github.com/brndnmtthws/conky")