gnu: grass: Depend on proj instead of proj.4.

* gnu/packages/geo.scm (grass)[inputs]: Replace proj.4 with proj.
[arguments]: Change --with-proj-share.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Felix Gruber 2021-10-02 12:55:51 +00:00 committed by Efraim Flashner
parent 4992cd7c4e
commit 552fde3b1e
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351

View file

@ -1953,7 +1953,7 @@ (define-public grass
("openblas" ,openblas) ("openblas" ,openblas)
("perl" ,perl) ("perl" ,perl)
("postgresql" ,postgresql) ("postgresql" ,postgresql)
("proj.4" ,proj.4) ("proj" ,proj)
("python" ,python) ("python" ,python)
("python-dateutil" ,python-dateutil) ("python-dateutil" ,python-dateutil)
("python-numpy" ,python-numpy) ("python-numpy" ,python-numpy)
@ -2009,7 +2009,7 @@ (define-public grass
"--with-netcdf" "--with-netcdf"
"--with-postgres" "--with-postgres"
(string-append "--with-proj-share=" (string-append "--with-proj-share="
(assoc-ref inputs "proj.4") (assoc-ref inputs "proj")
"/share/proj") "/share/proj")
"--with-pthread" "--with-pthread"
"--with-readline" "--with-readline"