[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/13: gnu: xorg: Return #t from all phases.
From: |
Mark H. Weaver |
Subject: |
08/13: gnu: xorg: Return #t from all phases. |
Date: |
Wed, 14 Nov 2018 23:45:20 -0500 (EST) |
mhw pushed a commit to branch core-updates
in repository guix.
commit c6bf07d14a42a0d7d67ce045c7654547cba0bd34
Author: Mark H Weaver <address@hidden>
Date: Wed Jun 27 21:16:30 2018 -0400
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.
---
gnu/packages/xdisorg.scm | 11 +++++++----
gnu/packages/xorg.scm | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index f233878..966847e 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 5adb04a..774001a 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)
- branch core-updates updated (21f7d88 -> 2e0f690), Mark H. Weaver, 2018/11/14
- 02/13: gnu: image: Return #t from all phases., Mark H. Weaver, 2018/11/14
- 03/13: gnu: linux: Return #t from all phases., Mark H. Weaver, 2018/11/14
- 07/13: gnu: xml: Return #t from all phases., Mark H. Weaver, 2018/11/14
- 01/13: gnu: admin: Return #t from all phases., Mark H. Weaver, 2018/11/14
- 04/13: gnu: networking: Return #t from all phases., Mark H. Weaver, 2018/11/14
- 05/13: gnu: perl: Return #t from all phases., Mark H. Weaver, 2018/11/14
- 06/13: gnu: video: Return #t from all phases., Mark H. Weaver, 2018/11/14
- 08/13: gnu: xorg: Return #t from all phases.,
Mark H. Weaver <=
- 09/13: gnu: audio: Return #t from all phases., Mark H. Weaver, 2018/11/14
- 10/13: gnu: check: Return #t from all phases., Mark H. Weaver, 2018/11/14
- 11/13: gnu: compression: Return #t from all phases., Mark H. Weaver, 2018/11/14
- 13/13: gnu: bioinformatics: Return #t from all phases and snippets., Mark H. Weaver, 2018/11/14
- 12/13: gnu: databases: Return #t from all phases., Mark H. Weaver, 2018/11/14