diff options
author | Peter Hoeg <peter@hoeg.com> | 2019-08-26 19:03:42 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2019-08-26 19:09:59 +0800 |
commit | 96f5d7941a3c96c0b6e36b2a314c087dfe015afd (patch) | |
tree | da1e5d5e78b6f2819a1bb25b718ec54a96de4971 /pkgs/development | |
parent | 76ad2796be28c5fbe8f8fe2b9bada12c3e1360e2 (diff) |
sqlitebrowser: do not use vendored qscintilla
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/tools/database/sqlitebrowser/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 7813eba04361..fe2db3ff79fd 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,25 +1,20 @@ { mkDerivation, lib, fetchFromGitHub, cmake, antlr -, qtbase, qttools, sqlite }: +, qtbase, qttools, qscintilla, sqlite }: mkDerivation rec { - version = "3.11.2"; pname = "sqlitebrowser"; + version = "3.11.2"; src = fetchFromGitHub { - repo = pname; owner = pname; + repo = pname; rev = "v${version}"; sha256 = "0ydd5fg76d5d23byac1f7f8mzx3brmd0cnnkd58qpmlzi7p9hcvx"; }; - buildInputs = [ qtbase sqlite ]; - - nativeBuildInputs = [ cmake antlr qttools ]; + buildInputs = [ antlr qtbase qscintilla sqlite ]; - # 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" ]; + nativeBuildInputs = [ cmake qttools ]; NIX_LDFLAGS = [ "-lQt5PrintSupport" |