From ae6a61d7311cde7ccb863bcff57e26f7674ebc18 Mon Sep 17 00:00:00 2001
From: Wiktor Żelazny <wzelazny@vurv.cz>
Date: Wed, 14 Oct 2020 19:24:05 +0200
Subject: gnu: r-sf: Use proj instead of proj.4.

This addresses segfaults while loading vector GIS data from a file.

* gnu/packages/cran.scm (r-sf)[inputs]: Replace proj.4 with proj, and add
sqlite.

Signed-off-by: Christopher Baines <mail@cbaines.net>
---
 gnu/packages/cran.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/cran.scm')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 59a409f8e9..252699c691 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -17,7 +17,7 @@
 ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2018, 2019 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2019 Nicolò Balzarotti <anothersms@gmail.com>
-;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
+;;; Copyright © 2019, 2020 Wiktor Żelazny <wzelazny@vurv.cz>
 ;;; Copyright © 2019 Arne Babenhauserheide <arne_bab@web.de>
 ;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Todor Kondić <tk.code@protonmail.com>
@@ -90,6 +90,7 @@ (define-module (gnu packages cran)
   #:use-module (gnu packages pulseaudio)  ;libsndfile
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages sqlite)
   #:use-module (gnu packages statistics)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages tls)
@@ -13957,7 +13958,8 @@ (define-public r-sf
     (inputs
      `(("gdal" ,gdal)
        ("geos" ,geos)
-       ("proj" ,proj.4)
+       ("proj" ,proj)
+       ("sqlite" ,sqlite)
        ("zlib" ,zlib)))
     (propagated-inputs
      `(("r-classint" ,r-classint)
-- 
cgit v1.2.3