From ba2a83195afb10ca7c65833f81cdc10748212873 Mon Sep 17 00:00:00 2001 From: ng0 Date: Tue, 24 Jan 2017 13:03:42 +0000 Subject: [PATCH 1/2] gnu: Add i3lock-color. * gnu/packages/wm.scm (i3lock-color): New variable. --- gnu/local.mk | 1 + gnu/packages/wm.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/gnu/local.mk b/gnu/local.mk index 54d1ac91c..2ec5844dc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -744,6 +744,7 @@ dist_patch_DATA = \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ + %D%/packages/patches/i3lock-color-fix-makefile.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-bug-1348660-pt5.patch \ %D%/packages/patches/icecat-bug-1415133.patch \ diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 62a5b5460..e4db72a6f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages gperf) #:use-module (gnu packages imagemagick) #:use-module (gnu packages lua) + #:use-module (gnu packages linux) #:use-module (gnu packages suckless) #:use-module (guix download) #:use-module (guix git-download)) @@ -335,6 +336,73 @@ and locate windows on all your workspaces, using an interactive dmenu prompt.") (license (license:non-copyleft "http://www.wtfpl.net/txt/copying/"))))) +(define-public i3lock-color + (package + (name "i3lock-color") + (version "2.9.1-c") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/chrjguill/i3lock-color/" + "archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18ql0kb24qlqsijs6j99algf2lprl78mzsz53b1hshmc8jjd4m27")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No tests included. + #:make-flags (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (etc (string-append out "/etc")) + (man (string-append out "/share/man")) + (xkb (assoc-ref inputs "libxkbcommon")) + (xkbheader (string-append xkb + "/include/xkbcommon/" + "xkbcommon-compose.h"))) + (substitute* "Makefile" + (("PKG_CONFIG=pkg-config") + (string-append "PKG_CONFIG=" + (which "pkg-config"))) + (("/usr/include/xkbcommon/xkbcommon-compose.h") + xkbheader) + (("PREFIX=/usr") + (string-append "PREFIX=" out)) + (("SYSCONFDIR=/etc") + (string-append "SYSCONFDIR=" etc)) + (("MANDIR=/usr/share/man") + (string-append "MANDIR=" man))) + #t)))))) + (inputs + `(("xcb-util-image" ,xcb-util-image) + ("xcb-util-keysyms" ,xcb-util-keysyms) + ("xcb-util" ,xcb-util) + ("libxcb" ,libxcb) + ("linux-pam" ,linux-pam) + ("libev" ,libev) + ("libx11" ,libx11) + ("cairo" ,cairo))) + (native-inputs + `(("libxkbcommon" ,libxkbcommon) + ("pkg-config" ,pkg-config) + ("which" ,which))) + (home-page "https://github.com/chrjguill/i3lock-color") + (synopsis "Screenlocker with color configuration support") + (description + "I3lock-color is a screen locker. It is a re-patched version of +i3lock, which is a simple screen locker like slock. Features include: + address@hidden address@hidden forking process, the locked screen is preserved when you suspend from RAM address@hidden specify background color or PNG image to be displayed in the lock screen address@hidden many additional color options address@hidden enumerate\n") + (license license:bsd-3))) + (define-public xmonad (package (name "xmonad") -- 2.15.0