From 8394619baceb118df92e355377fd543bb1aa501a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Dec 2021 17:18:24 +0100 Subject: gnu: Simplify package inputs. This commit was obtained by running: ./pre-inst-env guix style without any additional argument. --- gnu/packages/web-browsers.scm | 102 ++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 54 deletions(-) (limited to 'gnu/packages/web-browsers.scm') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 945dc72847..0fcb12d894 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -181,8 +181,7 @@ management, extensions such as advertisement blocker and colorful tabs.") (invoke "./configure" (string-append "--prefix=" out) "--enable-graphics"))))))) - (native-inputs `(("linux-libre-headers" ,linux-libre-headers) - ("pkg-config" ,pkg-config))) + (native-inputs (list linux-libre-headers pkg-config)) (inputs `(("gpm" ,gpm) ("libevent" ,libevent) ("libjpeg" ,libjpeg-turbo) @@ -227,7 +226,7 @@ features including, tables, builtin image display, bookmarks, SSL and more.") ("webkitgtk" ,webkitgtk-with-libsoup2) ("sqlite" ,sqlite))) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (build-system glib-or-gtk-build-system) (arguments `(#:make-flags @@ -286,16 +285,15 @@ and the GTK+ toolkit.") (base32 "06jhv8ibfw1xkf8d8zrnkc2aw4d462s77hlp6f6xa6k8awzxvmkg")))) (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config) - ("perl" ,perl))) - (inputs `(("ncurses" ,ncurses) - ("libidn" ,libidn) - ("openssl" ,openssl) - ("libgcrypt" ,libgcrypt) - ("unzip" ,unzip) - ("zlib" ,zlib) - ("gzip" ,gzip) - ("bzip2" ,bzip2))) + (native-inputs (list pkg-config perl)) + (inputs (list ncurses + libidn + openssl + libgcrypt + unzip + zlib + gzip + bzip2)) (arguments `(#:configure-flags (let ((openssl (assoc-ref %build-inputs "openssl"))) @@ -443,13 +441,13 @@ access.") (base32 "1kvkxkisi3czldnb43ig60l55pi4a3m2a4ixp7krhpf9fc5wp294"))))))) (inputs - `(("cmark" ,cmark) - ("font-google-noto" ,font-google-noto) - ("font-openmoji" ,font-openmoji) - ("openssl" ,openssl) - ("qtbase" ,qtbase-5) - ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg))) + (list cmark + font-google-noto + font-openmoji + openssl + qtbase-5 + qtmultimedia + qtsvg)) (home-page "https://kristall.random-projects.net") (synopsis "Small-internet graphical client") (description "Graphical small-internet client with with many features @@ -474,23 +472,23 @@ interface.") (base32 "05n64mw9lzzxpxr7lhakbkm9ir3x8p0rwk6vbbg01aqg5iaanyj0")))) (build-system python-build-system) (native-inputs - `(("python-attrs" ,python-attrs))) ; for tests + (list python-attrs)) ; for tests (inputs - `(("python-colorama" ,python-colorama) - ("python-cssutils" ,python-cssutils) - ("python-importlib-resources" ,python-importlib-resources) - ("python-jinja2" ,python-jinja2) - ("python-markupsafe" ,python-markupsafe) - ("python-pygments" ,python-pygments) - ("python-pypeg2" ,python-pypeg2) - ("python-pyyaml" ,python-pyyaml) - ;; FIXME: python-pyqtwebengine needs to come before python-pyqt so - ;; that it's __init__.py is used first. - ("python-pyqtwebengine" ,python-pyqtwebengine) - ("python-pyqt" ,python-pyqt) - ;; While qtwebengine is provided by python-pyqtwebengine, it's - ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. - ("qtwebengine" ,qtwebengine))) + (list python-colorama + python-cssutils + python-importlib-resources + python-jinja2 + python-markupsafe + python-pygments + python-pypeg2 + python-pyyaml + ;; FIXME: python-pyqtwebengine needs to come before python-pyqt so + ;; that it's __init__.py is used first. + python-pyqtwebengine + python-pyqt + ;; While qtwebengine is provided by python-pyqtwebengine, it's + ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. + qtwebengine)) (arguments `(;; FIXME: With the existance of qtwebengine, tests can now run. But ;; they are still disabled because test phase hangs. It's not readily @@ -567,7 +565,7 @@ GUI. It is based on PyQt5 and QtWebEngine.") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("webkitgtk" ,webkitgtk-with-libsoup2))) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (home-page "https://fanglingsu.github.io/vimb/") (synopsis "Fast and lightweight Vim-like web browser") (description "Vimb is a fast and lightweight vim like web browser based on @@ -715,18 +713,17 @@ is fully configurable and extensible in Common Lisp.") `(#:tests? #false ;no tests #:configure-flags (list "-DTFDN_ENABLE_SSE41=OFF"))) (native-inputs - `(("pkg-config" ,pkg-config) - ("zip" ,zip))) + (list pkg-config zip)) (inputs - `(("fribidi" ,fribidi) - ("harfbuzz" ,harfbuzz) - ("libunistring" ,libunistring) - ("libwebp" ,libwebp) - ("mpg123" ,mpg123) - ("openssl" ,openssl) - ("pcre" ,pcre) - ("sdl2" ,sdl2) - ("zlib" ,zlib))) + (list fribidi + harfbuzz + libunistring + libwebp + mpg123 + openssl + pcre + sdl2 + zlib)) (home-page "https://gmi.skyjake.fi/lagrange/") (synopsis "Graphical Gemini client") (description @@ -756,10 +753,9 @@ history, and page outlines.") `(#:tests? #f ; no check target #:make-flags (list (string-append "CC=" ,(cc-for-target))))) (inputs - `(("openssl" ,openssl))) + (list openssl)) (native-inputs - `(("pkg-config" ,pkg-config) - ("scdoc" ,scdoc))) + (list pkg-config scdoc)) (home-page "https://sr.ht/~sircmpwn/gmni") (synopsis "Minimalist command line Gemini client") (description "The gmni package includes: @@ -921,9 +917,7 @@ interface.") `(("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) (inputs - `(("libevent" ,libevent) - ("libressl" ,libressl) - ("ncurses" ,ncurses))) + (list libevent libressl ncurses)) (home-page "https://git.omarpolo.com/telescope/about/") (synopsis "Gemini client with a terminal interface") (description "Telescope is a w3m-like browser for Gemini.") -- cgit v1.2.3