diff options
| author | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/conky.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/conky.scm')
| -rw-r--r-- | gnu/packages/conky.scm | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm index 0df6d1f760..ad4d396289 100644 --- a/gnu/packages/conky.scm +++ b/gnu/packages/conky.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages fontutils) #:use-module (gnu packages image) + #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) @@ -39,7 +40,7 @@ (package (name "conky") (home-page "https://github.com/brndnmtthws/conky") - (version "1.11.6") + (version "1.12.2") (source (origin (method git-fetch) @@ -48,13 +49,14 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0y2g66fjqp2hdk0y1h4ijxhnv34j16gizvxpmbigwh4n6zijcm6v")))) + (base32 "1grxapl4q37fzk2rsijwz2rrl0aj520y8daki6bg48jb9vjd39n7")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; there are no tests - #:configure-flags + `(#:configure-flags (list "-DRELEASE=true" - "-DBUILD_PULSEAUDIO=ON") + "-DBUILD_PULSEAUDIO=ON" + "-DBUILD_WLAN=ON" + "-DBUILD_TESTS=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'add-freetype-to-search-path @@ -82,7 +84,8 @@ ("pulseaudio" ,pulseaudio) ("lua" ,lua) ("ncurses" ,ncurses) - ("curl" ,curl))) + ("curl" ,curl) + ("wireless-tools" ,wireless-tools))) (native-inputs `(("pkg-config" ,pkg-config))) (synopsis "Lightweight system monitor for X") |