summary refs log tree commit diff
path: root/gnu/packages/sqlite.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2019-11-28 15:12:49 +0200
committerEfraim Flashner <efraim@flashner.co.il>2019-11-28 15:17:42 +0200
commitfad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7 (patch)
tree4960615cda38f60ec658e5c1ad20c8dccb851344 /gnu/packages/sqlite.scm
parent8456f9fcd93034150460e7e950aa502db3cc3d38 (diff)
downloadguix-fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7.tar.gz
gnu: sqlite: Build with column metadata.
* gnu/packages/sqlite.scm (sqlite)[arguments]: Add configure flag to
enable column metadata.
(sqlite-with-column-metadata): Remove variable.
* gnu/packages/fontutils.scm (fontmanager)[inputs]: Replace
sqlite-with-column-metadata with sqlite.
* gnu/packages/messaging (dino)[inputs]: Ditto.
* gnu/packages/music.scm (clementine)[inputs]: Ditto.
* gnu/packages/qt.scm (qtbase)[inputs]: Ditto.
* gnu/packages/telephony.scm (jami)[inputs]: Remove
sqlite-with-column-metadata.
[arguments]: Remove custom 'wrap phase.
Diffstat (limited to 'gnu/packages/sqlite.scm')
-rw-r--r--gnu/packages/sqlite.scm15
1 files changed, 2 insertions, 13 deletions
diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm
index 6d6df17f90..1a064197b8 100644
--- a/gnu/packages/sqlite.scm
+++ b/gnu/packages/sqlite.scm
@@ -74,7 +74,8 @@
       (list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE "
                            "-DSQLITE_ENABLE_FTS3 "
                            "-DSQLITE_ENABLE_UNLOCK_NOTIFY "
-                           "-DSQLITE_ENABLE_DBSTAT_VTAB"))))
+                           "-DSQLITE_ENABLE_DBSTAT_VTAB "
+                           "-DSQLITE_ENABLE_COLUMN_METADATA"))))
    (home-page "https://www.sqlite.org/")
    (synopsis "The SQLite database management system")
    (description
@@ -83,15 +84,3 @@ zero-configuration, transactional SQL database engine.  SQLite is the most
 widely deployed SQL database engine in the world.  The source code for SQLite
 is in the public domain.")
    (license license:public-domain)))
-
-;; This is used by Qt.
-(define-public sqlite-with-column-metadata
-  (package/inherit sqlite
-    (name "sqlite-with-column-metadata")
-    (arguments
-     (substitute-keyword-arguments (package-arguments sqlite)
-       ((#:configure-flags flags)
-        `(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE "
-                              "-DSQLITE_ENABLE_UNLOCK_NOTIFY "
-                              "-DSQLITE_ENABLE_DBSTAT_VTAB "
-                              "-DSQLITE_ENABLE_COLUMN_METADATA")))))))