me/guix
Archived
1
0
Fork 0
Code Activity

gnu: xorg: Return #t from all phases.

Browse source 
* gnu/packages/xorg.scm (xcompmgr)
* gnu/packages/xdisorg.scm (xdotool, scrot, unclutter, xscreensaver)
(tint2, nxbelld, xautolock): Return #t from all phases.
This commit is contained in:
Mark H Weaver 2018-06-27 21:16:30 -04:00
parent aa6f87a2b9
commit c6bf07d14a
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/xdisorg.scm
View file

@ -243,7 +243,8 @@ X11 (yet).")
(mkdir-p (string-append out "/lib")) (mkdir-p (string-append out "/lib"))
(setenv "PREFIX" out) (setenv "PREFIX" out)
(setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib")) (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))
(setenv "CC" "gcc"))))))) (setenv "CC" "gcc")
#t))))))
(native-inputs `(("perl" ,perl))) ; for pod2man (native-inputs `(("perl" ,perl))) ; for pod2man
(inputs `(("libx11" ,libx11) (inputs `(("libx11" ,libx11)
("libxext" ,libxext) ("libxext" ,libxext)
@ -477,7 +478,7 @@ move windows, switch between desktops, etc.).")
(doc (string-append out "/share/doc/scrot"))) (doc (string-append out "/share/doc/scrot")))
(mkdir-p doc) (mkdir-p doc)
(invoke "make" "install" (invoke "make" "install"
(string-append "docsdir=" doc)))))))) (string-append "docsdir=" doc))))))))
(inputs (inputs
`(("libx11" ,libx11) `(("libx11" ,libx11)
("giblib" ,giblib))) ("giblib" ,giblib)))
@ -1004,7 +1005,8 @@ color temperature should be set to match the lamps in your room.")
(lambda _ (lambda _
(substitute* '("driver/Makefile.in" "po/Makefile.in.in") (substitute* '("driver/Makefile.in" "po/Makefile.in.in")
(("@GTK_DATADIR@") "@datadir@") (("@GTK_DATADIR@") "@datadir@")
(("@PO_DATADIR@") "@datadir@"))))) (("@PO_DATADIR@") "@datadir@"))
#t)))
#:configure-flags '("--with-pam" "--with-proc-interrupts" #:configure-flags '("--with-pam" "--with-proc-interrupts"
"--without-readdisplay") "--without-readdisplay")
#:make-flags (list (string-append "AD_DIR=" #:make-flags (list (string-append "AD_DIR="
@ -1164,7 +1166,8 @@ by name.")
(add-after 'unpack 'fix-installation-prefix (add-after 'unpack 'fix-installation-prefix
(lambda _ (lambda _
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("/etc") "${CMAKE_INSTALL_PREFIX}/etc"))))))) (("/etc") "${CMAKE_INSTALL_PREFIX}/etc"))
#t)))))
(inputs (inputs
`(("gtk+" ,gtk+-2) `(("gtk+" ,gtk+-2)
("imlib2" ,imlib2) ("imlib2" ,imlib2)

2
gnu/packages/xorg.scm
View file

@ -5939,7 +5939,7 @@ Conventions Manual) and some of the @dfn{EWMH}
(add-after 'unpack 'autogen (add-after 'unpack 'autogen
(lambda _ (lambda _
(setenv "NOCONFIGURE" "t") (setenv "NOCONFIGURE" "t")
(zero? (system* "sh" "autogen.sh"))))))) (invoke "sh" "autogen.sh"))))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf) ("autoconf" ,autoconf)