me
/
guix
Archived
1
0
Fork 0
Code

gnu: qmapshack: Remove sqlite-with-column-metadata workaround. 

* gnu/packages/geo.scm (qmapshack)[arguments]: Do not set LD_LIBRARY_PATH in
wrapper scripts.
master
Marius Bakke 2020-01-24 17:54:58 +01:00
parent d040e650b2
commit 5fcc5b38ed
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/geo.scm
View File

@ -1431,23 +1431,15 @@ using the dataset of topographical information collected by
(invoke "patch" "-p1" "-i" "FindQuaZip5.patch") (invoke "patch" "-p1" "-i" "FindQuaZip5.patch")
#t)) #t))
(add-after 'install 'wrap (add-after 'install 'wrap
;; The program fails to run with the error: ;; The program fails to find the QtWebEngineProcess program,
;; undefined symbol: sqlite3_column_table_name16
;; Forcing the program to use sqlite-with-column-metadata instead
;; of sqlite using LD_LIBRARY_PATH solves the problem.
;;
;; The program also fails to find the QtWebEngineProcess program,
;; so we set QTWEBENGINEPROCESS_PATH to help it. ;; so we set QTWEBENGINEPROCESS_PATH to help it.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
(qtwebengineprocess (string-append (qtwebengineprocess (string-append
(assoc-ref inputs "qtwebengine") (assoc-ref inputs "qtwebengine")
"/lib/qt5/libexec/QtWebEngineProcess")) "/lib/qt5/libexec/QtWebEngineProcess")))
(sqlite-lib (string-append (assoc-ref inputs "sqlite")
"/lib")))
(for-each (lambda (program) (for-each (lambda (program)
(wrap-program program (wrap-program program
`("LD_LIBRARY_PATH" ":" prefix (,sqlite-lib))
`("QTWEBENGINEPROCESS_PATH" = `("QTWEBENGINEPROCESS_PATH" =
(,qtwebengineprocess)))) (,qtwebengineprocess))))
(find-files bin ".*"))) (find-files bin ".*")))