bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 12:05:19 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: sqlitebrowser: Use system nlohmann-json.

Browse source 
* gnu/packages/databases.scm (sqlitebrowser):
[source]: Remove bundled nlohmann-json and patch includes.
[native-inputs]: Add nlohmann-json (header-only library).

Change-Id: I80036372a51073b8f891a260d6a4531a6bd65cf8
Signed-off-by: Andreas Enge <andreas@enge.fr>
This commit is contained in:
Philippe SWARTVAGHER 2026-01-17 19:15:29 +01:00 • committed by Andreas Enge
parent ca5e06e6d3
commit 1317dfcd4e
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/databases.scm
View file

@ -5912,13 +5912,26 @@ a Gtk.Grid Widget.")
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "libs/qcustomplot-source/")
(delete-file-recursively "libs/qhexedit/")
(delete-file-recursively "libs/qscintilla")))))
;; Delete bundled dependencies, available as Guix packages.
(for-each delete-file-recursively
(list "libs/json"
"libs/qcustomplot-source"
"libs/qhexedit"
"libs/qscintilla"))
;; Patch #includes to be able to use Guix's nlohmann-json
(with-directory-excursion "src"
(substitute* (list "RemoteCommitsModel.h"
"RemoteLocalFilesModel.h"
"RemoteModel.h"
"RemotePushDialog.cpp"
"RemoteNetwork.cpp"
"RemoteDock.cpp"
"ExportDataDialog.cpp"
"EditDialog.cpp")
(("json\\.hpp") "nlohmann/json.hpp")))))))
(build-system qt-build-system)
(arguments
(list #:configure-flags
;; TODO: Unbundle json (nlohmann-json).
#~(list (string-append "-DQSCINTILLA_INCLUDE_DIR="
#$(this-package-input "qscintilla")
"/include/Qsci")
@ -5932,7 +5945,7 @@ a Gtk.Grid Widget.")
qtbase-5
qtwayland-5
sqlite))
(native-inputs (list qttools-5))
(native-inputs (list nlohmann-json qttools-5))
(home-page "https://sqlitebrowser.org/")
(synopsis "Visual database browser and editor for SQLite")
(description "Sqlitebrowser lets you create, design, and edit database files