diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-01-26 00:58:19 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-01-26 00:58:19 +0100 |
| commit | c92f98ad51f86182a72f30a8d4dd232d67145944 (patch) | |
| tree | 9bb68433dad36a3b049f84cbd1f34ede52d2d95f | |
| parent | 187e4a4b6d7856dfa70506f2fc4a6e059d9fbd5e (diff) | |
| download | gnu-guix-c92f98ad51f86182a72f30a8d4dd232d67145944.tar gnu-guix-c92f98ad51f86182a72f30a8d4dd232d67145944.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/conky.scm | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm index f0f19c5a0e..2301bfbdf1 100644 --- a/gnu/packages/conky.scm +++ b/gnu/packages/conky.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu> +;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,15 +25,16 @@ #:use-module (guix build-system cmake) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages fontutils) - #:use-module (gnu packages ncurses) + #:use-module (gnu packages image) #:use-module (gnu packages lua) + #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xorg)) (define-public conky (package (name "conky") - (version "1.10.6") + (version "1.10.7") (source (origin (method url-fetch) @@ -40,15 +42,12 @@ version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1jk0my7z45vz9vd8958d27nkk4kvr53k7wyf6cz2x9xjc0lri02c")))) + (base32 "1b06rigfjxnaidkabkyf8mdh9k3jm11nj547lb5liwi2ql4rdfr3")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests #:configure-flags - '("-DRELEASE=true" - ;; XXX: it checks ncurses with pkg-config. - ;; TODO: add 'ncurses.pc' to the ncurses package. - "-DBUILD_NCURSES=false") + (list "-DRELEASE=true") #:phases (modify-phases %standard-phases (add-after 'unpack 'add-freetype-to-search-path @@ -67,12 +66,14 @@ #t))))) (inputs `(("freetype" ,freetype) - ("ncurses" ,ncurses) + ("imlib2" ,imlib2) ("libx11" ,libx11) ("libxdamage" ,libxdamage) + ("libxext" ,libxext) ("libxft" ,libxft) ("libxinerama" ,libxinerama) - ("lua" ,lua))) + ("lua" ,lua) + ("ncurses" ,ncurses))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/brndnmtthws/conky") |