me
/
guix
Archived
1
0
Fork 0
Code

gnu: nginx-lua-module: Fix builder. 

Probably broken by the changes to the nginx package in
4079cd9ba3.

* gnu/packages/web.scm (nginx-lua-module)[arguments]: Make the modify-phases
part a gexp, and move #:configure-flags to the end of the list.
master
Christopher Baines 2022-04-25 18:34:19 +01:00
parent a14c635266
commit fa1b772fb3
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
gnu/packages/web.scm
View File

@ -726,42 +726,42 @@ documentation.")
,@(package-inputs nginx))) ,@(package-inputs nginx)))
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments
`(#:configure-flags '("--add-dynamic-module=.") `(#:make-flags '("modules")
#:make-flags '("modules")
#:modules ((guix build utils) #:modules ((guix build utils)
(guix build gnu-build-system) (guix build gnu-build-system)
(ice-9 popen) (ice-9 popen)
(ice-9 regex) (ice-9 regex)
(ice-9 textual-ports)) (ice-9 textual-ports))
,@(package-arguments nginx)) ,@(package-arguments nginx)
#:configure-flags '("--add-dynamic-module=."))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'unpack-nginx-sources (add-after 'unpack 'unpack-nginx-sources
(lambda* (#:key inputs native-inputs #:allow-other-keys) (lambda* (#:key inputs native-inputs #:allow-other-keys)
(begin (begin
;; The nginx source code is part of the module’s source. ;; The nginx source code is part of the module’s source.
(format #t "decompressing nginx source code~%") (format #t "decompressing nginx source code~%")
(let ((tar (assoc-ref inputs "tar")) (let ((tar (assoc-ref inputs "tar"))
(nginx-srcs (assoc-ref inputs "nginx-sources"))) (nginx-srcs (assoc-ref inputs "nginx-sources")))
(invoke (string-append tar "/bin/tar") (invoke (string-append tar "/bin/tar")
"xvf" nginx-srcs "--strip-components=1")) "xvf" nginx-srcs "--strip-components=1"))
#t))) #t)))
(add-before 'configure 'set-luajit-env (add-before 'configure 'set-luajit-env
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((luajit (assoc-ref inputs "luajit"))) (let ((luajit (assoc-ref inputs "luajit")))
(setenv "LUAJIT_LIB" (setenv "LUAJIT_LIB"
(string-append luajit "/lib")) (string-append luajit "/lib"))
(setenv "LUAJIT_INC" (setenv "LUAJIT_INC"
(string-append luajit "/include/luajit-2.1")) (string-append luajit "/include/luajit-2.1"))
#t))) #t)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((modules-dir (string-append (assoc-ref outputs "out") (let ((modules-dir (string-append (assoc-ref outputs "out")
"/etc/nginx/modules"))) "/etc/nginx/modules")))
(install-file "objs/ngx_http_lua_module.so" modules-dir) (install-file "objs/ngx_http_lua_module.so" modules-dir)
#t))) #t)))
(delete 'fix-root-dirs) (delete 'fix-root-dirs)
(delete 'install-man-page))))) (delete 'install-man-page)))))
(synopsis "NGINX module for Lua programming language support") (synopsis "NGINX module for Lua programming language support")
(description "This NGINX module provides a scripting support with Lua (description "This NGINX module provides a scripting support with Lua
programming language."))) programming language.")))