From df66c705b9801b2c583b69acc14327478f61b46d Mon Sep 17 00:00:00 2001 From: ng0 Date: Sun, 7 Aug 2016 13:03:52 +0000 Subject: [PATCH] gnu: slock: Move to xdisorg.scm. * gnu/packages/suckless.scm (slock): Move from here ... * gnu/packages/xdisorg.scm (slock): ... to here. --- gnu/packages/suckless.scm | 27 --------------------------- gnu/packages/xdisorg.scm | 28 ++++++++++++++++++++++++++++ gnu/services/desktop.scm | 2 +- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 1bb577c..7fe3403 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -31,33 +31,6 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages webkit)) -(define-public slock - (package - (name "slock") - (version "1.2") - (source (origin - (method url-fetch) - (uri (string-append "http://dl.suckless.org/tools/slock-" - version ".tar.gz")) - (sha256 - (base32 - "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il")))) - (build-system gnu-build-system) - (arguments - '(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) - #:phases (alist-delete 'configure %standard-phases))) - (inputs - `(("libx11" ,libx11) - ("libxext" ,libxext) - ("libxinerama" ,libxinerama))) - (home-page "http://tools.suckless.org/slock/") - (synopsis "Simple X session lock") - (description - "Simple X session lock with trivial feedback on password entry.") - (license license:x11))) - (define-public surf (package (name "surf") diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 226e5c1..18b8cb8 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Alex Kost +;;; Coypright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -976,3 +977,30 @@ connectivity of the X server running on a particular @code{DISPLAY}.") applications you regularily use and also allows you to search for an application by name.") (license license:expat))) + +(define-public slock + (package + (name "slock") + (version "1.2") + (source (origin + (method url-fetch) + (uri (string-append "http://dl.suckless.org/tools/slock-" + version ".tar.gz")) + (sha256 + (base32 + "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no tests + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" %output)) + #:phases (alist-delete 'configure %standard-phases))) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("libxinerama" ,libxinerama))) + (home-page "http://tools.suckless.org/slock/") + (synopsis "Simple X session lock") + (description + "Simple X session lock with trivial feedback on password entry.") + (license license:x11))) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index bf21707..9fdbb47 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Sou Bunnbu +;;; Coypright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,7 +38,6 @@ #:use-module (gnu packages avahi) #:use-module (gnu packages polkit) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages suckless) #:use-module (gnu packages linux) #:use-module (guix records) #:use-module (guix packages) -- 2.9.2