From 1898b8386b6a5f235b716c6fb7c34775bda88861 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 26 Jan 2022 13:28:39 +0200 Subject: gnu: sqlitebrowser: Unbundle qscintilla. * gnu/packages/databases.scm (sqlitebrowser)[source]: Add snippet. [arguments]: Add configure-flag to find qscintilla include directory. [inputs]: Add qscintilla. --- gnu/packages/databases.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 22224178ed..1bdee6092b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -4333,17 +4333,26 @@ a Gtk.Grid Widget.") (uri (git-reference (url "https://github.com/sqlitebrowser/sqlitebrowser") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1ljqzcx388mmni8lv9jz5r58alhsjrrqi4nzjnbfki94rn4ray6z")) - (file-name (git-file-name name version)))) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "libs/qcustomplot-source/") + (delete-file-recursively "libs/qscintilla"))))) (build-system qt-build-system) (arguments (list #:tests? #f ; no tests #:configure-flags - ;; TODO: Unbundle QHexEdit, QScintilla. - #~(list "-DFORCE_INTERNAL_QCUSTOMPLOT=OFF"))) + ;; TODO: Unbundle QHexEdit. + #~(list (string-append "-DQSCINTILLA_INCLUDE_DIR=" + #$(this-package-input "qscintilla") + "/include/Qsci") + "-DFORCE_INTERNAL_QCUSTOMPLOT=OFF"))) (inputs (list qcustomplot + qscintilla qtbase-5 sqlite)) (native-inputs (list qttools)) -- cgit v1.2.3