From 5cf81294c097a0c31cb2f5360e7e1e418407e065 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 6 May 2022 14:13:27 +0300 Subject: gnu: links: Update to 2.26. * gnu/packages/web-browsers.scm (links): Update to 2.26. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web-browsers.scm') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 645b11e740..07df9f7580 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -157,14 +157,14 @@ management, extensions such as advertisement blocker and colorful tabs.") (define-public links (package (name "links") - (version "2.25") + (version "2.26") (source (origin (method url-fetch) (uri (string-append "http://links.twibright.com/download/" "links-" version ".tar.bz2")) (sha256 (base32 - "0b6x97xi8i4pag2scba02c0h95cm3sia58q99zppk0lfd448bmrd")))) + "1jy90k04kl7y3l8jzg5jx7fglyqzngng0964j7j67gjxy9vkanzh")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 1123da369db5fa95fc306eac20ff4b7572384b87 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 6 May 2022 14:16:10 +0300 Subject: gnu: links: Use configure-flags. * gnu/packages/web-browsers.scm (links)[arguments]: Add configure-flags field. Adjust custom 'configure phase to use configure-flags. --- gnu/packages/web-browsers.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/web-browsers.scm') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 07df9f7580..b761fa73a8 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -167,10 +167,11 @@ management, extensions such as advertisement blocker and colorful tabs.") "1jy90k04kl7y3l8jzg5jx7fglyqzngng0964j7j67gjxy9vkanzh")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags '("--enable-graphics") + #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key outputs (configure-flags '()) #:allow-other-keys) ;; The tarball uses a very old version of autoconf. It doesn't ;; understand extra flags like `--enable-fast-install', so ;; we need to invoke it with just what it understands. @@ -180,9 +181,9 @@ management, extensions such as advertisement blocker and colorful tabs.") `((setenv "CHOST" ,(%current-target-system))) '()) (setenv "CONFIG_SHELL" (which "bash")) - (invoke "./configure" - (string-append "--prefix=" out) - "--enable-graphics"))))))) + (apply invoke "./configure" + (string-append "--prefix=" out) + configure-flags))))))) (native-inputs (list pkg-config)) (inputs `(("gpm" ,gpm) ("libevent" ,libevent) -- cgit v1.2.3 From d540c6792b0ca8830c93505fc72647a21be2b230 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 6 May 2022 14:17:41 +0300 Subject: gnu: links: Remove input labels. * gnu/packages/web-browsers.scm (links)[inputs]: Remove input labels. --- gnu/packages/web-browsers.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu/packages/web-browsers.scm') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index b761fa73a8..2632ba257b 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -185,14 +185,15 @@ management, extensions such as advertisement blocker and colorful tabs.") (string-append "--prefix=" out) configure-flags))))))) (native-inputs (list pkg-config)) - (inputs `(("gpm" ,gpm) - ("libevent" ,libevent) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("libxt" ,libxt) - ("openssl" ,openssl) - ("zlib" ,zlib))) + (inputs + (list gpm + libevent + libjpeg-turbo + libpng + libtiff + libxt + openssl + zlib)) (synopsis "Text and graphics mode web browser") (description "Links is a graphics and text mode web browser, with many features including, tables, builtin image display, bookmarks, SSL and more.") -- cgit v1.2.3 From 22b794a4a7df724b41a6e17897bf47136dd1857a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 6 May 2022 14:27:36 +0300 Subject: gnu: links: Use gexps. * gnu/packages/web-browsers.scm (links)[arguments]: Rewrite using gexps. --- gnu/packages/web-browsers.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'gnu/packages/web-browsers.scm') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 2632ba257b..198d289ef3 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -167,23 +167,24 @@ management, extensions such as advertisement blocker and colorful tabs.") "1jy90k04kl7y3l8jzg5jx7fglyqzngng0964j7j67gjxy9vkanzh")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--enable-graphics") + (list + #:configure-flags #~(list "--enable-graphics") #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs (configure-flags '()) #:allow-other-keys) - ;; The tarball uses a very old version of autoconf. It doesn't - ;; understand extra flags like `--enable-fast-install', so - ;; we need to invoke it with just what it understands. - (let ((out (assoc-ref outputs "out"))) - ;; 'configure' doesn't understand '--host'. - ,@(if (%current-target-system) - `((setenv "CHOST" ,(%current-target-system))) - '()) - (setenv "CONFIG_SHELL" (which "bash")) - (apply invoke "./configure" - (string-append "--prefix=" out) - configure-flags))))))) + #~(modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs (configure-flags '()) #:allow-other-keys) + ;; The tarball uses a very old version of autoconf. It doesn't + ;; understand extra flags like `--enable-fast-install', so + ;; we need to invoke it with just what it understands. + (let ((out (assoc-ref outputs "out"))) + ;; 'configure' doesn't understand '--host'. + #$@(if (%current-target-system) + #~((setenv "CHOST" #$(%current-target-system))) + #~()) + (setenv "CONFIG_SHELL" (which "bash")) + (apply invoke "./configure" + (string-append "--prefix=" out) + configure-flags))))))) (native-inputs (list pkg-config)) (inputs (list gpm -- cgit v1.2.3