01/07: cl-sqlite (FIX)

[Pierre Neidhardt]

ambrevar pushed a commit to branch wip-next-browser
in repository guix.

commit e29608220a4eb08105b6ad226dea6e6c013ae411
Author: Pierre Neidhardt <address@hidden>
Date:   Fri Oct 5 15:58:15 2018 +0200

    cl-sqlite (FIX)
---
 gnu/packages/lisp.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 40a39fe..5db86a4 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -2958,14 +2958,24 @@ package.")
        `(("iterate" ,sbcl-iterate)
          ("cffi" ,sbcl-cffi)
          ("sqlite" ,sqlite)))
+      (native-inputs
+       `(("fiveam" ,sbcl-fiveam)
+         ("bordeaux-threads" ,sbcl-bordeaux-threads)))
       ;; TODO: This won't build because we need to add the lib folder of
       ;; sqlite to cffi:*foreign-library-directories* before compiling with
       ;; ASDF.
       (arguments
-       `(#:asd-file "sqlite.asd"
+       `(#:tests? #f                    ; Upstream seems to have issues with 
tests: https://github.com/dmitryvk/cl-sqlite/issues/7
+         #:asd-file "sqlite.asd"
          #:asd-system-name "sqlite"
-         ;; #:cffi-foreign-library-directories (list (string-append (assoc-ref 
%build-inputs "sqlite") "/lib"))
-         ))
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'fix-paths
+             (lambda* (#:key inputs #:allow-other-keys)
+               (define freetype (assoc-ref inputs "freetype"))
+               (substitute* "sqlite-ffi.lisp"
+                 (("libsqlite3" all) (string-append
+                                      (assoc-ref inputs "sqlite")"/lib/" 
all))))))))
       (home-page "https://common-lisp.net/project/cl-sqlite/";)
       (synopsis "Common Lisp binding for SQLite")
       (description