branch master updated: gnu: nginx: Allow to pass configure-flags.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

wigust pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 2a7f4be  gnu: nginx: Allow to pass configure-flags.
2a7f4be is described below

commit 2a7f4be8f3beaeb051bf1e1912d8e517b8af1407
Author: Oleg Pykhalov <go.wigust@gmail.com>
AuthorDate: Sun Oct 11 13:13:08 2020 +0300

    gnu: nginx: Allow to pass configure-flags.
    
    * gnu/packages/web.scm (nginx)[arguments]<configure>:
    Accept '#:configure-flags'.
---
 gnu/packages/web.scm | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 17c6778..1699c92 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -254,31 +254,32 @@ Interface} specification.")
              #t))
          (replace 'configure
            ;; The configure script is hand-written, not from GNU autotools.
-           (lambda* (#:key outputs #:allow-other-keys)
+           (lambda* (#:key configure-flags outputs #:allow-other-keys)
              (let ((flags
-                    (list (string-append "--prefix=" (assoc-ref outputs "out"))
-                          "--with-http_ssl_module"
-                          "--with-http_v2_module"
-                          "--with-pcre-jit"
-                          "--with-debug"
-                          ;; Even when not cross-building, we pass the
-                          ;; --crossbuild option to avoid customizing for the
-                          ;; kernel version on the build machine.
-                          ,(let ((system "Linux")    ; uname -s
-                                 (release "3.2.0")   ; uname -r
-                                 ;; uname -m
-                                 (machine (match (or (%current-target-system)
-                                                     (%current-system))
-                                            ("x86_64-linux"   "x86_64")
-                                            ("i686-linux"     "i686")
-                                            ("mips64el-linux" "mips64")
-                                            ;; Prevent errors when querying
-                                            ;; this package on unsupported
-                                            ;; platforms, e.g. when running
-                                            ;; "guix package --search="
-                                            (_                "UNSUPPORTED"))))
-                             (string-append "--crossbuild="
-                                            system ":" release ":" machine)))))
+                    (append (list (string-append "--prefix=" (assoc-ref 
outputs "out"))
+                                  "--with-http_ssl_module"
+                                  "--with-http_v2_module"
+                                  "--with-pcre-jit"
+                                  "--with-debug"
+                                  ;; Even when not cross-building, we pass the
+                                  ;; --crossbuild option to avoid customizing 
for the
+                                  ;; kernel version on the build machine.
+                                  ,(let ((system "Linux")    ; uname -s
+                                         (release "3.2.0")   ; uname -r
+                                         ;; uname -m
+                                         (machine (match (or 
(%current-target-system)
+                                                             (%current-system))
+                                                    ("x86_64-linux"   "x86_64")
+                                                    ("i686-linux"     "i686")
+                                                    ("mips64el-linux" "mips64")
+                                                    ;; Prevent errors when 
querying
+                                                    ;; this package on 
unsupported
+                                                    ;; platforms, e.g. when 
running
+                                                    ;; "guix package --search="
+                                                    (_                
"UNSUPPORTED"))))
+                                     (string-append "--crossbuild="
+                                                    system ":" release ":" 
machine)))
+                            configure-flags)))
                (setenv "CC" "gcc")
                (format #t "configure flags: ~s~%" flags)
                (apply invoke "./configure" flags)