From 0260bba10303e9c24302b5d3fd4ba1e0d1e2303f Mon Sep 17 00:00:00 2001 From: ng0 Date: Sun, 7 Aug 2016 12:52:18 +0000 Subject: [PATCH 1/3] gnu: dwm: Move to wm.scm. * gnu/packages/suckless.scm (dwm): Move from here ... * gnu/packages/wm.scm (dwm): ... to here. --- gnu/packages/suckless.scm | 38 -------------------------------------- gnu/packages/wm.scm | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 16e9146..9ec6dcf 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -31,44 +31,6 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages webkit)) -(define-public dwm - (package - (name "dwm") - (version "6.0") - (source (origin - (method url-fetch) - (uri (string-append "http://dl.suckless.org/dwm/dwm-" - version ".tar.gz")) - (sha256 - (base32 "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f - #:phases - (alist-replace - 'configure - (lambda _ - (substitute* "Makefile" (("\\$\\{CC\\}") "gcc")) - #t) - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (zero? - (system* "make" "install" - (string-append "DESTDIR=" out) "PREFIX=")))) - %standard-phases)))) - (inputs - `(("libx11" ,libx11) - ("libxinerama" ,libxinerama))) - (home-page "http://dwm.suckless.org/") - (synopsis "Dynamic window manager") - (description - "dwm is a dynamic window manager for X. It manages windows in tiled, -monocle and floating layouts. All of the layouts can be applied dynamically, -optimising the environment for the application in use and the task performed.") - (license license:x11))) - (define-public dmenu (package (name "dmenu") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2cc9f44..8df4a8e 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Carlo Zancanaro ;;; Copyright © 2016 Ludovic Courtès +;;; Coypright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -465,3 +466,41 @@ Windows are grouped by tags in awesome. Each window can be tagged with one or more tags. Selecting certain tags displays all windows with these tags.") (license license:gpl2+) (home-page "https://awesome.naquadah.org/"))) + +(define-public dwm + (package + (name "dwm") + (version "6.0") + (source (origin + (method url-fetch) + (uri (string-append "http://dl.suckless.org/dwm/dwm-" + version ".tar.gz")) + (sha256 + (base32 "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases + (alist-replace + 'configure + (lambda _ + (substitute* "Makefile" (("\\$\\{CC\\}") "gcc")) + #t) + (alist-replace + 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (zero? + (system* "make" "install" + (string-append "DESTDIR=" out) "PREFIX=")))) + %standard-phases)))) + (inputs + `(("libx11" ,libx11) + ("libxinerama" ,libxinerama))) + (home-page "http://dwm.suckless.org/") + (synopsis "Dynamic window manager") + (description + "dwm is a dynamic window manager for X. It manages windows in tiled, +monocle and floating layouts. All of the layouts can be applied dynamically, +optimising the environment for the application in use and the task performed.") + (license license:x11))) -- 2.9.2