[PATCH] gnu: Add conky.

[PATCH] gnu: Add conky.

[Siniša Biđin]

[-- Attachment #1: Type: text/plain, Size: 84 bytes --]

Hi,

This depends on my previous Lua patch, adding its pkg-config file.

Siniša

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-conky.patch --]
[-- Type: text/x-diff; name=0001-gnu-Add-conky.patch, Size: 4053 bytes --]

From 24415951e5458ce176ee3fe860b125e1229c9a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sini=C5=A1a=20Bi=C4=91in?= <sinisa@bidin.eu>
Date: Fri, 21 Aug 2015 18:20:46 +0200
Subject: [PATCH] gnu: Add conky.

* gnu/packages/conky.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am          |  1 +
 gnu/packages/conky.scm | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 gnu/packages/conky.scm

diff --git a/gnu-system.am b/gnu-system.am
index b43dc5b..9557515 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -65,6 +65,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/commencement.scm			\
   gnu/packages/compression.scm			\
   gnu/packages/conkeror.scm			\
+  gnu/packages/conky.scm			\
   gnu/packages/cook.scm				\
   gnu/packages/cpio.scm				\
   gnu/packages/cppi.scm				\
diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm
new file mode 100644
index 0000000..fa04c56
--- /dev/null
+++ b/gnu/packages/conky.scm
@@ -0,0 +1,78 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages conky)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #: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 lua)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xorg))
+
+(define-public conky
+  (package
+    (name "conky")
+    (version "1.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/brndnmtthws/conky/archive/v"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1szq4ckfkvyabv5llf9nkdxipn7429sralsxyr7z0dyc3zwz74pk"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f ; there are no tests
+       #:phases
+       (alist-cons-after
+        'unpack 'add-freetype-to-search-path
+        (lambda* (#:key inputs #:allow-other-keys)
+          (substitute* "cmake/ConkyPlatformChecks.cmake"
+            (("set\\(INCLUDE_SEARCH_PATH")
+             (string-append
+              "set(INCLUDE_SEARCH_PATH "
+              (assoc-ref inputs "freetype") "/include/freetype2 ")))
+          #t)
+        (alist-replace
+         'install
+         (lambda* (#:key outputs #:allow-other-keys)
+           (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
+             (mkdir-p bin)
+             (copy-file "src/conky" (string-append bin "/conky"))))
+         %standard-phases))))
+    (inputs
+     `(("freetype" ,freetype)
+       ("ncurses" ,ncurses)
+       ("libx11" ,libx11)
+       ("libxdamage" ,libxdamage)
+       ("libxft" ,libxft)
+       ("lua" ,lua)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "https://github.com/brndnmtthws/conky")
+    (synopsis "Light-weight system monitor for X")
+    (description
+     "Conky is a free, light-weight system monitor for X, that displays any
+kind of information on your desktop.")
+    (license (list license:bsd-3 license:gpl3))))
--
2.4.3

Re: [PATCH] gnu: Add conky.

[Ludovic Courtès]

Siniša Biđin <sinisa@bidin.eu> skribis:

> From 24415951e5458ce176ee3fe860b125e1229c9a35 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Sini=C5=A1a=20Bi=C4=91in?= <sinisa@bidin.eu>
> Date: Fri, 21 Aug 2015 18:20:46 +0200
> Subject: [PATCH] gnu: Add conky.
>
> * gnu/packages/conky.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.

Applied.

> +    (synopsis "Light-weight system monitor for X")
> +    (description
> +     "Conky is a free, light-weight system monitor for X, that displays any
> +kind of information on your desktop.")

I took the freedom to slightly amend these to remove “free” (it’s
necessarily free :-)), spell “lightweight”, and mention OS statistics
instead of “any kind of information.”

Thank you,
Ludo’.

Re: [PATCH] gnu: Add conky.

[Ludovic Courtès]

On closer inspection, I noticed that most files in src/ actually carry
the GPLv3 with the “or later” clause, so I changed the license to
‘gpl3+’.

Ludo’.