summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-06-27 21:16:30 -0400
committerMark H Weaver <mhw@netris.org>2018-11-14 23:44:08 -0500
commitc6bf07d14a42a0d7d67ce045c7654547cba0bd34 (patch)
tree0f9b899b79c7aaf30d0e186d29d29f41e2f38b88
parentaa6f87a2b984039229abbaba08c06415a782badc (diff)
gnu: xorg: Return #t from all phases.
* gnu/packages/xorg.scm (xcompmgr) * gnu/packages/xdisorg.scm (xdotool, scrot, unclutter, xscreensaver) (tint2, nxbelld, xautolock): Return #t from all phases.
-rw-r--r--gnu/packages/xdisorg.scm11
-rw-r--r--gnu/packages/xorg.scm2
2 files changed, 8 insertions, 5 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index f2338783d2..966847e245 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -243,7 +243,8 @@ X11 (yet).")
(mkdir-p (string-append out "/lib"))
(setenv "PREFIX" out)
(setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))
- (setenv "CC" "gcc")))))))
+ (setenv "CC" "gcc")
+ #t))))))
(native-inputs `(("perl" ,perl))) ; for pod2man
(inputs `(("libx11" ,libx11)
("libxext" ,libxext)
@@ -477,7 +478,7 @@ move windows, switch between desktops, etc.).")
(doc (string-append out "/share/doc/scrot")))
(mkdir-p doc)
(invoke "make" "install"
- (string-append "docsdir=" doc))))))))
+ (string-append "docsdir=" doc))))))))
(inputs
`(("libx11" ,libx11)
("giblib" ,giblib)))
@@ -1004,7 +1005,8 @@ color temperature should be set to match the lamps in your room.")
(lambda _
(substitute* '("driver/Makefile.in" "po/Makefile.in.in")
(("@GTK_DATADIR@") "@datadir@")
- (("@PO_DATADIR@") "@datadir@")))))
+ (("@PO_DATADIR@") "@datadir@"))
+ #t)))
#:configure-flags '("--with-pam" "--with-proc-interrupts"
"--without-readdisplay")
#:make-flags (list (string-append "AD_DIR="
@@ -1164,7 +1166,8 @@ by name.")
(add-after 'unpack 'fix-installation-prefix
(lambda _
(substitute* "CMakeLists.txt"
- (("/etc") "${CMAKE_INSTALL_PREFIX}/etc")))))))
+ (("/etc") "${CMAKE_INSTALL_PREFIX}/etc"))
+ #t)))))
(inputs
`(("gtk+" ,gtk+-2)
("imlib2" ,imlib2)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 5adb04a86a..774001af6c 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5939,7 +5939,7 @@ Conventions Manual) and some of the @dfn{EWMH}
(add-after 'unpack 'autogen
(lambda _
(setenv "NOCONFIGURE" "t")
- (zero? (system* "sh" "autogen.sh")))))))
+ (invoke "sh" "autogen.sh"))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)