diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-12-13 17:18:24 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-12-13 17:48:25 +0100 |
commit | 8394619baceb118df92e355377fd543bb1aa501a (patch) | |
tree | 504f07c2a9f88596a305b59ef45f941062426a52 /gnu/packages/gnuzilla.scm | |
parent | aca2defe0172868295941fd9f0e97886f6e9b2d4 (diff) | |
download | guix-8394619baceb118df92e355377fd543bb1aa501a.tar.gz |
gnu: Simplify package inputs.
This commit was obtained by running: ./pre-inst-env guix style without any additional argument.
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
-rw-r--r-- | gnu/packages/gnuzilla.scm | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index bbc6b53677..26fd5f95eb 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -119,9 +119,9 @@ ("pkg-config" ,pkg-config) ("python" ,python-2))) (propagated-inputs - `(("nspr" ,nspr))) ; in the Requires.private field of mozjs-17.0.pc + (list nspr)) ; in the Requires.private field of mozjs-17.0.pc (inputs - `(("zlib" ,zlib))) + (list zlib)) (arguments `(;; XXX: parallel build fails, lacking: ;; mkdir -p "system_wrapper_js/" @@ -196,8 +196,7 @@ in C/C++.") '("--host=aarch64-unknown-linux-gnu") '()))))))))) (inputs - `(("libffi" ,libffi) - ("zlib" ,zlib))))) + (list libffi zlib)))) (define-public mozjs-38 (package @@ -280,10 +279,7 @@ in C/C++.") ("pkg-config" ,pkg-config) ("python-2" ,python-2))) (inputs - `(("libffi" ,libffi) - ("readline" ,readline) - ("icu4c" ,icu4c) - ("zlib" ,zlib))))) + (list libffi readline icu4c zlib)))) (define-public mozjs-52 ;; No releases yet at <https://archive.mozilla.org/pub/spidermonkey/releases/>. @@ -349,9 +345,8 @@ in C/C++.") (cons (string-append "--prefix=" out) configure-flags)))))))) (native-inputs - `(("autoconf" ,autoconf-2.13) - ("automake" ,automake) - ,@(package-native-inputs mozjs-38)))))) + (modify-inputs (package-native-inputs mozjs-38) + (prepend autoconf-2.13 automake)))))) (define-public mozjs-60 ;; No releases yet at <https://archive.mozilla.org/pub/spidermonkey/releases/>. @@ -579,9 +574,7 @@ in C/C++.") ("rust" ,rust) ("cargo" ,rust "cargo"))) (inputs - `(("icu4c" ,icu4c) - ("readline" ,readline) - ("zlib" ,zlib))))) + (list icu4c readline zlib)))) (define mozilla-compare-locales (origin @@ -1702,8 +1695,7 @@ Thunderbird. It supports email, news feeds, chat, calendar and contacts.") "17yyyxp47z4m8hnflcq34rc1y871515kr3f1y42j1l0yx3g0il07")))) (build-system trivial-build-system) (inputs - `(("nss" ,nss) - ("python" ,python))) + (list nss python)) (arguments `(#:modules ((guix build utils)) #:builder @@ -1742,8 +1734,8 @@ Mozilla (Firefox, Waterfox, Thunderbird, SeaMonkey) profiles.") (sha256 (base32 "1xxn8yzr6j8j6prmbj6mxspdczigarfiv3vlm9k70yxmky65ijh3")))) (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("lz4" ,lz4))) + (native-inputs (list pkg-config)) + (inputs (list lz4)) (arguments `(#:tests? #f ; no check target #:phases |