summaryrefslogtreecommitdiffstats
path: root/pkgs/development/tools/database
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2019-05-11 13:37:19 +0200
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-05-23 15:10:35 +0200
commit731fdbef7cc5982301b3009aa83fcff293337a35 (patch)
tree14e6d7ad74d419376e51baaf9885651ee96f29f0 /pkgs/development/tools/database
parentedb1668130d26319ea15b68eff7e180bcc113dfd (diff)
sqlitebrowser: 3.10.1 -> 3.11.2
The latest releases of `sqlitebrowser` contain several new features like a dark mode, improved CSV import/export and a lot of new bugfixes: https://github.com/sqlitebrowser/sqlitebrowser/releases/tag/v3.11.2 https://github.com/sqlitebrowser/sqlitebrowser/releases/tag/v3.11.1 https://github.com/sqlitebrowser/sqlitebrowser/releases/tag/v3.11.0 Also some minor changes were applied to the package definition: * Using the `pname`/`version` convention now. * Use internal `qscintilla` rather than our package to fix the build (https://github.com/sqlitebrowser/sqlitebrowser/issues/1348#issuecomment-374170936). This can probably be removed when https://github.com/NixOS/nixpkgs/pull/56034 is merged. * Dropped patch which removed Test and Print support as QT 5.12 is now used to build the application.
Diffstat (limited to 'pkgs/development/tools/database')
-rw-r--r--pkgs/development/tools/database/sqlitebrowser/default.nix30
1 files changed, 12 insertions, 18 deletions
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 929dfc61ba33..7813eba04361 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,38 +1,32 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, antlr
-, qtbase, qttools, qscintilla, sqlite }:
+, qtbase, qttools, sqlite }:
mkDerivation rec {
- version = "3.10.1";
- name = "sqlitebrowser-${version}";
+ version = "3.11.2";
+ pname = "sqlitebrowser";
src = fetchFromGitHub {
- repo = "sqlitebrowser";
- owner = "sqlitebrowser";
+ repo = pname;
+ owner = pname;
rev = "v${version}";
- sha256 = "1brzam8yv6sbdmbqsp7vglhd6wlx49g2ap8llr271zrkld4k3kar";
+ sha256 = "0ydd5fg76d5d23byac1f7f8mzx3brmd0cnnkd58qpmlzi7p9hcvx";
};
- buildInputs = [ qtbase qscintilla sqlite ];
+ buildInputs = [ qtbase sqlite ];
nativeBuildInputs = [ cmake antlr qttools ];
+ # Use internal `qscintilla` rather than our package to fix the build
+ # (https://github.com/sqlitebrowser/sqlitebrowser/issues/1348#issuecomment-374170936).
+ # This can probably be removed when https://github.com/NixOS/nixpkgs/pull/56034 is merged.
+ cmakeFlags = [ "-DFORCE_INTERNAL_QSCINTILLA=ON" ];
+
NIX_LDFLAGS = [
"-lQt5PrintSupport"
];
enableParallelBuilding = true;
- # We have to patch out Test and PrintSupport to make this work with Qt 5.9
- # It can go when the application supports 5.9
- postPatch = ''
- substituteInPlace CMakeLists.txt \
- --replace Test "" \
- --replace PrintSupport ""
-
- substituteInPlace libs/qcustomplot-source/CMakeLists.txt \
- --replace PrintSupport ""
- '';
-
meta = with lib; {
description = "DB Browser for SQLite";
homepage = http://sqlitebrowser.org/;