futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: nginx-rtmp-module: Fix builder.

Browse Source 
Probably broken by changes to the nginx package in
4079cd9ba33b0d2cd23897899dfc66836797e4d2 .

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

50
gnu/packages/web.scm
View File

@ -786,34 +786,34 @@ programming language.")))
,@(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))
,@(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~%")
(invoke "tar" "xvf" (assoc-ref inputs "nginx-sources") (invoke "tar" "xvf" (assoc-ref inputs "nginx-sources")
;; This package's LICENSE file would be ;; This package's LICENSE file would be
;; overwritten with the one from nginx when ;; overwritten with the one from nginx when
;; unpacking the nginx source, so rename the nginx ;; unpacking the nginx source, so rename the nginx
;; one when unpacking. ;; one when unpacking.
"--transform=s,/LICENSE$,/LICENSE.nginx," "--transform=s,/LICENSE$,/LICENSE.nginx,"
"--strip-components=1") "--strip-components=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_rtmp_module.so" modules-dir) (install-file "objs/ngx_rtmp_module.so" modules-dir)
#t))) #t)))
(delete 'fix-root-dirs) (delete 'fix-root-dirs)
(delete 'install-man-page))))) (delete 'install-man-page)))))
(home-page "https://github.com/arut/nginx-rtmp-module") (home-page "https://github.com/arut/nginx-rtmp-module")
(synopsis "NGINX module for audio and video streaming with RTMP") (synopsis "NGINX module for audio and video streaming with RTMP")
(description "This NGINX module provides streaming with the @acronym{RTMP, (description "This NGINX module provides streaming with the @acronym{RTMP,