[PATCH] gnu: st: Mov to terminals.scm.

[ng0]

From 3864654025329367b6f87ccfb12a4ff789d5155a Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Sun, 7 Aug 2016 12:30:06 +0000
Subject: [PATCH] gnu: st: Move to terminals.scm.

* gnu/packages/suckless.scm (st): Move from here ...
* gnu/packages/terminals.scm (st): ... to here.
---
 gnu/packages/suckless.scm  | 50 +-------------------------------------------
 gnu/packages/terminals.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 8732a84..16e9146 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -28,10 +28,8 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages xorg)
-  #:use-module (gnu packages fonts)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages webkit)
-  #:use-module (gnu packages fontutils))
+  #:use-module (gnu packages webkit))
 
 (define-public dwm
   (package
@@ -126,52 +124,6 @@ numbers of user-defined menu items efficiently.")
      "Simple X session lock with trivial feedback on password entry.")
     (license license:x11)))
 
-(define-public st
-  (package
-    (name "st")
-    (version "0.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "http://dl.suckless.org/st/st-";
-                           version ".tar.gz"))
-       (sha256
-        (base32
-         "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:tests? #f ; no tests
-       #:make-flags (list "CC=gcc"
-                          (string-append "PREFIX=" %output))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (add-after 'unpack 'inhibit-terminfo-install
-                    (lambda _
-                      (substitute* "Makefile"
-                        (("address@hidden -s st.info") ""))
-                      #t)))))
-    (inputs
-     `(("libx11" ,libx11)
-       ("libxft" ,libxft)
-       ("libxcomposite" ,libxcomposite)
-       ("compositeproto" ,compositeproto)
-       ("libxext" ,libxext)
-       ("xextproto" ,xextproto)
-       ("libxrender" ,libxrender)
-       ("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("font-liberation" ,font-liberation)))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (home-page "http://st.suckless.org/";)
-    (synopsis "Simple terminal emulator")
-    (description
-     "St implements a simple and lightweight terminal emulator.  It
-implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
-antialiased fonts (using fontconfig), fallback fonts, resizing, and line
-drawing.")
-    (license license:x11)))
-
 (define-public surf
   (package
     (name "surf")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 98f0060..02cb9fa 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016 Mckinley Olsen <address@hidden>
 ;;; Copyright © 2016 Alex Griffin <address@hidden>
+;;; Copyright © 2016 ng0 <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,7 +37,10 @@
   #:use-module (gnu packages wm)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages gtk)
-  #:use-module (gnu packages gnome))
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages fonts)
+  #:use-module (gnu packages fontutils))
 
 (define-public tilda
   (package
@@ -159,3 +163,49 @@ insert mode and command mode where keybindings have 
different functions.")
 Forget screen recording apps and blurry video.  Enjoy a lightweight, purely
 text-based approach to terminal recording.")
     (license license:gpl3)))
+
+(define-public st
+  (package
+    (name "st")
+    (version "0.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://dl.suckless.org/st/st-";
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ; no tests
+       #:make-flags (list "CC=gcc"
+                          (string-append "PREFIX=" %output))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-after 'unpack 'inhibit-terminfo-install
+           (lambda _
+             (substitute* "Makefile"
+               (("address@hidden -s st.info") ""))
+             #t)))))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxft" ,libxft)
+       ("libxcomposite" ,libxcomposite)
+       ("compositeproto" ,compositeproto)
+       ("libxext" ,libxext)
+       ("xextproto" ,xextproto)
+       ("libxrender" ,libxrender)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("font-liberation" ,font-liberation)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (home-page "http://st.suckless.org/";)
+    (synopsis "Simple terminal emulator")
+    (description
+     "St implements a simple and lightweight terminal emulator.  It
+implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
+antialiased fonts (using fontconfig), fallback fonts, resizing, and line
+drawing.")
+    (license license:x11)))
-- 
2.9.2

-- 
♥Ⓐ  ng0
Current Keys: https://we.make.ritual.n0.is/ng0.txt
For non-prism friendly talk find me on http://www.psyced.org

signature.asc
Description: PGP signature