nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Move scrot to (gnu packages xdisorg). 

* gnu/packages/scrot.scm: Remove.
  (scrot) Move to...
* gnu/packages/xdisorg.scm (scrot): ... here.  New variable.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove scrot file name.
This commit is contained in:
Alex Kost 2014-12-09 21:23:46 +03:00
parent 2e88e089da
commit 1410f342f7
3 changed files with 43 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu-system.am
View File

@ -233,7 +233,6 @@ GNU_SYSTEM_MODULES = \
gnu/packages/scanner.scm \
gnu/packages/scheme.scm \
gnu/packages/screen.scm \
gnu/packages/scrot.scm \
gnu/packages/sdl.scm \
gnu/packages/search.scm \
gnu/packages/serveez.scm \

68
gnu/packages/scrot.scm
View File

@ -1,68 +0,0 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
;;;
;;; 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 scrot)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix licenses)
#:use-module (gnu packages xorg)
#:use-module (gnu packages image))
(define-public scrot
(package
(name "scrot")
(version "0.8")
(source (origin
(method url-fetch)
(uri (string-append
"http://linuxbrit.co.uk/downloads/scrot-"
version ".tar.gz"))
(sha256
(base32
"1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"))))
(build-system gnu-build-system)
(arguments
;; By default, man and doc are put in PREFIX/{man,doc} instead of
;; PREFIX/share/{man,doc}.
'(#:configure-flags
(list (string-append "--mandir="
(assoc-ref %outputs "out")
"/share/man"))
#:phases (alist-replace
'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/scrot")))
(mkdir-p doc)
(zero?
(system* "make" "install"
(string-append "docsdir=" doc)))))
%standard-phases)))
(inputs
`(("libx11" ,libx11)
("giblib" ,giblib)))
(home-page "http://linuxbrit.co.uk/software/")
(synopsis "Command-line screen capture utility for X Window System")
(description
"Scrot allows to save a screenshot of a full screen, a window or a part
of the screen selected by mouse.")
;; This license removes a clause about X Consortium from the original
;; X11 license.
(license (x11-style "file://COPYING"
"See 'COPYING' in the distribution."))))

43
gnu/packages/xdisorg.scm
View File

@ -251,3 +251,46 @@ with the EWMH/NetWM specification. It can query the window manager for
information, and request for certain window management actions (resize and
move windows, switch between desktops, etc.)")
(license license:gpl2+)))
(define-public scrot
(package
(name "scrot")
(version "0.8")
(source (origin
(method url-fetch)
(uri (string-append
"http://linuxbrit.co.uk/downloads/scrot-"
version ".tar.gz"))
(sha256
(base32
"1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"))))
(build-system gnu-build-system)
(arguments
;; By default, man and doc are put in PREFIX/{man,doc} instead of
;; PREFIX/share/{man,doc}.
'(#:configure-flags
(list (string-append "--mandir="
(assoc-ref %outputs "out")
"/share/man"))
#:phases (alist-replace
'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/scrot")))
(mkdir-p doc)
(zero?
(system* "make" "install"
(string-append "docsdir=" doc)))))
%standard-phases)))
(inputs
`(("libx11" ,libx11)
("giblib" ,giblib)))
(home-page "http://linuxbrit.co.uk/software/")
(synopsis "Command-line screen capture utility for X Window System")
(description
"Scrot allows to save a screenshot of a full screen, a window or a part
of the screen selected by mouse.")
;; This license removes a clause about X Consortium from the original
;; X11 license.
(license (license:x11-style "file://COPYING"
"See 'COPYING' in the distribution."))))