;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
+;;; Copyright © 2016, 2017, 2018 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages gettext)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages xorg)
#:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix git-download)
(define-public w3m
(package
(name "w3m")
- (version "0.5.3+git20161120")
+ (version "0.5.3+git20180125")
(source (origin
(method git-fetch)
- ;; Debian's fork of w3m is the only one that is still
- ;; maintained.
+ ;; Debian's fork of w3m is the only one that is still maintained.
(uri (git-reference
- (url "https://anonscm.debian.org/cgit/collab-maint/w3m.git")
+ (url "https://salsa.debian.org/debian/w3m.git")
(commit (string-append "v" version))))
- (file-name (string-append "w3m-" version "-checkout"))
+ (file-name (git-file-name name version))
(sha256
(base32
- "06n5a9jdyihkd4xdjmyci32dpqp1k2l5awia5g9ng0bn256bacdc"))))
+ "0dafdfx1yhrvhbqzslkcapj09dvf64m2jadz3wl2icni0k4msq90"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no check target
+ ;; Use $EDITOR instead of a hard-coded value.
+ #:configure-flags '("--with-editor=")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-perl
(("@PERL@") (which "perl")))
#t)))))
(inputs
- `(("libgc" ,libgc)
+ `(("gdk-pixbuf" ,gdk-pixbuf)
+ ("libgc" ,libgc)
+ ("libx11" ,libx11)
("ncurses" ,ncurses)
("openssl" ,openssl)
("zlib" ,zlib)))