civodul pushed a commit to branch master
in repository guix.
commit f2d86db81d028b751bb9742f0ab495f2b44543b0
Author: Ludovic Courtès <[email protected]>
AuthorDate: Wed Aug 3 14:56:38 2022 +0200
gnu: xscreensaver: Remove custom 'configure' phase.
This is a followup to 45456595ac4ba613c8a61ff4f51088efd4157e6e, which
was based on an incorrect diagnosis.
* gnu/packages/xdisorg.scm (xscreensaver)[source]: Add 'snippet'.
[arguments]: Remove custom 'configure' phase. Reintroduce
#:configure-flags.
---
gnu/packages/xdisorg.scm | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 5635f45d4c..1ce0886c2f 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <[email protected]>
;;; Copyright © 2014 Eric Bavier <[email protected]>
;;; Copyright © 2014, 2015, 2016 Alex Kost <[email protected]>
-;;; Copyright © 2013, 2015, 2017, 2018, 2019, 2021 Ludovic Courtès
<[email protected]>
+;;; Copyright © 2013, 2015, 2017-2019, 2021-2022 Ludovic Courtès <[email protected]>
;;; Copyright © 2015, 2016 Mathieu Lirzin <[email protected]>
;;; Copyright © 2015 Alexander I.Grafov <[email protected]>
;;; Copyright © 2015 Andy Wingo <[email protected]>
@@ -1635,7 +1635,15 @@ less if you are working in front of the screen at
night.")
(string-append "https://www.jwz.org/xscreensaver/xscreensaver-";
version ".tar.gz"))
(sha256
- (base32 "0lmiyvp3qs2gngd53f191jmlizs9l04i2gnrqbn96mqckyr18w3q"))))
+ (base32 "0lmiyvp3qs2gngd53f191jmlizs9l04i2gnrqbn96mqckyr18w3q"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; 'configure.ac' checks for $ac_unrecognized_opts and exits if it's
+ ;; non-empty. Since the default 'configure' phases passes options
+ ;; that may or may not be recognized, such as '--enable-fast-install',
+ ;; these need to be tolerated, hence this snippet.
+ '(substitute* "configure"
+ (("exit 2") "true")))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
@@ -1646,24 +1654,9 @@ less if you are working in front of the screen at
night.")
(substitute* '("driver/Makefile.in" "po/Makefile.in.in")
(("@GTK_DATADIR@") "@datadir@")
(("@PO_DATADIR@") "@datadir@"))
- #t))
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- ;; The tarball uses a very old version of autconf. It does not
- ;; understand extra flags like `--enable-fast-install', so
- ;; we need to invoke it with just what it understands.
- (let ((out (assoc-ref outputs "out")))
- ;; 'configure' doesn't understand '--host'.
- ,@(if (%current-target-system)
- `((setenv "CHOST" ,(%current-target-system)))
- '())
- (setenv "CONFIG_SHELL" (which "bash"))
- (setenv "SHELL" (which "bash"))
- (invoke "./configure"
- (string-append "--prefix=" out)
- "--with-pam"
- "--with-proc-interrupts"
- "--without-readdisplay")))))
+ #t)))
+ #:configure-flags '("--with-pam" "--with-proc-interrupts"
+ "--without-readdisplay")
#:make-flags (list (string-append "AD_DIR="
(assoc-ref %outputs "out")
"/lib/X11/app-defaults"))))
