diff options
author | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-13 11:17:51 +0200 |
---|---|---|
committer | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-13 11:17:51 +0200 |
commit | 135bc7e31ba92b4a948fbb246ec4ed17a297e1fb (patch) | |
tree | f27cd2fbd859aa00f7b9ef2c2f33b15fbf99041f /gnu/packages/lisp-xyz.scm | |
parent | 3b39207477876cad8d6d12f906b86c0d3f9b8ac8 (diff) | |
download | guix-patches-135bc7e31ba92b4a948fbb246ec4ed17a297e1fb.tar guix-patches-135bc7e31ba92b4a948fbb246ec4ed17a297e1fb.tar.gz |
gnu: sbcl-clsql: Activate postgresql support.
* gnu/packages/lisp-xyz.scm (sbcl-clsql)[arguments]: Remove 'clsql-cffi.asd'
from 'asd-files'. Add 'clsql-postgresql' to 'asd-systems'. Add 'fix-build'
phase.
Diffstat (limited to 'gnu/packages/lisp-xyz.scm')
-rw-r--r-- | gnu/packages/lisp-xyz.scm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9003381e2c..8a98c9f902 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8743,8 +8743,7 @@ interface for MySQL, PostgreSQL and SQLite.") ("uffi" ,sbcl-uffi) ("zlib" ,zlib))) (arguments - `(#:asd-files '("clsql-cffi.asd" - "clsql.asd" + `(#:asd-files '("clsql.asd" "clsql-uffi.asd" "clsql-sqlite3.asd" "clsql-postgresql.asd" @@ -8752,8 +8751,7 @@ interface for MySQL, PostgreSQL and SQLite.") "clsql-mysql.asd") #:asd-systems '("clsql" "clsql-sqlite3" - ;; TODO: Find why postgresql-sql.lisp fails to compile. - ;;"clsql-postgresql" + "clsql-postgresql" "clsql-postgresql-socket3" "clsql-mysql") #:phases @@ -8762,6 +8760,15 @@ interface for MySQL, PostgreSQL and SQLite.") (lambda _ (make-file-writable "doc/html.tar.gz") #t)) + (add-after 'unpack 'fix-build + (lambda _ + (substitute* "clsql-uffi.asd" + (("\\(:version uffi \"2.0\"\\)") + "uffi")) + (substitute* "db-postgresql/postgresql-api.lisp" + (("\\(data :cstring\\)") + "(data :string)")) + #t)) (add-after 'unpack 'fix-paths (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "db-sqlite3/sqlite3-loader.lisp" |