nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: node: Use more unbundled dependencies. 

* gnu/packages/node.scm (node)[inputs]: Add icu4c and nghttp2.
[native-inputs]: Add pkg-config.
[arguments]: Add configure flags for using system libraries.
[source]: Remove bundled dependencies.
This commit is contained in:
Jelle Licht 2018-03-12 17:46:03 +01:00
parent f06e391338
commit fe5d4f81be
No known key found for this signature in database
GPG Key ID: DA4597F947B41025
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gnu/packages/node.scm
View File

@ -31,9 +31,11 @@
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages web)) #:use-module (gnu packages web))
@ -48,16 +50,36 @@
"/node-v" version ".tar.gz")) "/node-v" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1mjr1rm5w26c0yb4zq6z5yv3zbvqk18lwbswhwn1sha8hapinjp8")))) "1mjr1rm5w26c0yb4zq6z5yv3zbvqk18lwbswhwn1sha8hapinjp8"))
(modules '((guix build utils)))
(snippet
`(begin
;; Remove bundled software.
(for-each delete-file-recursively
'("deps/cares"
"deps/http_parser"
"deps/icu-small"
"deps/nghttp2"
"deps/openssl"
"deps/uv"
"deps/zlib"))
(substitute* "Makefile"
;; Remove references to bundled software
(("deps/http_parser/http_parser.gyp") "")
(("deps/uv/include/\\*.h") "")
(("deps/uv/uv.gyp") "")
(("deps/zlib/zlib.gyp") ""))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; TODO: Purge the bundled copies from the source. ;; TODO: Purge the bundled copies from the source.
'(#:configure-flags '("--shared-openssl" '(#:configure-flags '("--shared-cares"
"--shared-zlib"
"--shared-libuv"
"--shared-cares"
"--shared-http-parser" "--shared-http-parser"
"--without-snapshot") "--shared-libuv"
"--shared-nghttp2"
"--shared-openssl"
"--shared-zlib"
"--without-snapshot"
"--with-intl=system-icu")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-files (add-before 'configure 'patch-files
@ -131,6 +153,7 @@
(native-inputs (native-inputs
`(("python" ,python-2) `(("python" ,python-2)
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config)
("procps" ,procps) ("procps" ,procps)
("util-linux" ,util-linux) ("util-linux" ,util-linux)
("which" ,which))) ("which" ,which)))
@ -141,7 +164,9 @@
(inputs (inputs
`(("c-ares" ,c-ares) `(("c-ares" ,c-ares)
("http-parser" ,http-parser) ("http-parser" ,http-parser)
("icu4c" ,icu4c)
("libuv" ,libuv) ("libuv" ,libuv)
("nghttp2" ,nghttp2 "lib")
("openssl" ,openssl) ("openssl" ,openssl)
("zlib" ,zlib))) ("zlib" ,zlib)))
(synopsis "Evented I/O for V8 JavaScript") (synopsis "Evented I/O for V8 JavaScript")