aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/xdisorg.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/xdisorg.scm')
-rw-r--r--gnu/packages/xdisorg.scm29
1 files changed, 13 insertions, 16 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 0432411ab7..18b78ccc7f 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
-;;; Copyright © 2013, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Alexander I.Grafov <grafov@gmail.com>
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
@@ -91,11 +91,13 @@
"1i3f1agixxbfy4kxikb2b241p7c2lg73cl9wqfvlwz3q6zf5faxv"))
(modules '((guix build utils)))
(snippet
- ;; Do not record a timestamp and file name in gzipped man
- ;; pages (this is equivalent to 'gzip --no-name'.)
- '(substitute* "setup.py"
- (("gzip\\.open\\(gzfile, 'w', 9\\)")
- "gzip.GzipFile('', 'wb', 9, open(gzfile, 'wb'), 0.)")))))
+ '(begin
+ ;; Do not record a timestamp and file name in gzipped man
+ ;; pages (this is equivalent to 'gzip --no-name'.)
+ (substitute* "setup.py"
+ (("gzip\\.open\\(gzfile, 'w', 9\\)")
+ "gzip.GzipFile('', 'wb', 9, open(gzfile, 'wb'), 0.)"))
+ #t))))
(build-system python-build-system)
(arguments
`(#:python ,python-2 ;incompatible with python 3
@@ -137,12 +139,7 @@ program.")
"0n7pczk9vv30zf8qfln8ba3hnif9yfdxg0m84djac469wc28hnya"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f ; There is no test suite
- #:phases
- (modify-phases %standard-phases
- ;; Since version 0.13, bootstrapped releases are no longer available.
- (add-after 'unpack 'bootstrap
- (lambda _ (zero? (system* "autoreconf" "-v")))))))
+ '(#:tests? #f)) ;there is no test suite
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)))
@@ -628,9 +625,7 @@ things less distracting.")
("libxi" ,libxi)
("libxtst" ,libxtst)))
(native-inputs
- `(("inputproto" ,inputproto)
- ("xextproto" ,xextproto)
- ("xproto" ,xproto)))
+ `(("xorgproto" ,xorgproto)))
(synopsis "Tools to automate tasks in X such as detecting on screen images")
(description
"Xautomation can control X from the command line for scripts, and
@@ -1259,7 +1254,9 @@ program for X11. It was designed to be fast, tiny and scriptable in any languag
(modules '((guix build utils)))
(snippet
;; Drop bundled m4.
- '(delete-file-recursively "m4"))))
+ '(begin
+ (delete-file-recursively "m4")
+ #t))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)