;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
+;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
(define-module (gnu packages nvi)
#:use-module (gnu packages)
- #:use-module (gnu packages databases)
+ #:use-module (gnu packages dbm)
#:use-module (gnu packages ncurses)
#:use-module (guix packages)
#:use-module (guix download)
".tar.bz2"))
(sha256
(base32 "0nbbs1inyrqds0ywn3ln5slv54v5zraq7lszkg8nsavv4kivhh9l"))
- (patches (list (search-patch "nvi-assume-preserve-path.patch")))
+ (patches (search-patches "nvi-assume-preserve-path.patch"
+ "nvi-dbpagesize-binpower.patch"
+ "nvi-db4.patch"))
+ (modules '((guix build utils)))
(snippet
;; Create a wrapper for the configure script, make it executable.
'(let ((conf-wrap (open-output-file "configure")))
conf-wrap)
(newline conf-wrap)
(close-output-port conf-wrap)
- (chmod "configure" #o0755)))))
+ (chmod "configure" #o0755)
+
+ ;; Glibc 2.30 removed the deprecated <sys/stropts.h>, so fall back
+ ;; to the internal PTY allocation logic.
+ (substitute* "ex/ex_script.c"
+ (("#ifdef HAVE_SYS5_PTY")
+ "#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)"))
+ #t))))
(build-system gnu-build-system)
(arguments
- `(#:out-of-source? #t))
+ `(#:out-of-source? #t
+ #:configure-flags '("--enable-widechar")))
(inputs
`(("bdb" ,bdb)
("ncurses" ,ncurses)))