me
/
guix
Archived
1
0
Fork 0
Code

gnu: qgis: Disable SAGA. 

QGIS support for SAGA is currently not working.

* gnu/packages/geo.scm (qgis)[inputs]: Remove saga.
  [arguments]: Remove PATH wrapping for saga.
master
Guillaume Le Vaillant 2021-02-08 13:36:55 +01:00
parent 48650b0c35
commit 5e686e0a2c
No known key found for this signature in database
GPG Key ID: 6BE8208ADF21FE3F
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/geo.scm
View File

@ -2152,8 +2152,11 @@ growing set of geoscientific methods.")
#t)) #t))
(add-after 'wrap-qt 'wrap-gis (add-after 'wrap-qt 'wrap-gis
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; TODO: Find if there is a way to get SAGA to work.
;; Currently QGIS says "version of SAGA not supported".
;; Disable it for now.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(saga (string-append (assoc-ref inputs "saga") "/bin")) ;;(saga (string-append (assoc-ref inputs "saga") "/bin"))
(grass-version ,(package-version grass)) (grass-version ,(package-version grass))
(grass-majorminor (string-join (grass-majorminor (string-join
(list-head (list-head
@ -2162,7 +2165,7 @@ growing set of geoscientific methods.")
(grass (string-append (assoc-ref inputs "grass") (grass (string-append (assoc-ref inputs "grass")
"/grass" grass-majorminor))) "/grass" grass-majorminor)))
(wrap-program (string-append out "/bin/qgis") (wrap-program (string-append out "/bin/qgis")
`("PATH" ":" prefix (,saga)) ;;`("PATH" ":" prefix (,saga))
`("QGIS_PREFIX_PATH" = (,out)) `("QGIS_PREFIX_PATH" = (,out))
`("GISBASE" = (,grass)))) `("GISBASE" = (,grass))))
#t))))) #t)))))
@ -2209,7 +2212,7 @@ growing set of geoscientific methods.")
("qtsvg" ,qtsvg) ("qtsvg" ,qtsvg)
("qtwebkit" ,qtwebkit) ("qtwebkit" ,qtwebkit)
("qwt" ,qwt) ("qwt" ,qwt)
("saga" ,saga) ;;("saga" ,saga)
("sqlite" ,sqlite))) ("sqlite" ,sqlite)))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)