diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-09-28 13:26:34 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-28 13:26:34 -0500 |
commit | fccbb5daf3f715de0b09b83822b76b18cd46e9fb (patch) | |
tree | 35234b58019cd2df2446f3639b859a51675cfdbd /pkgs/development/tools/database | |
parent | 32ab45b8d0efed629e7d587aea342bfe9d87e58a (diff) | |
parent | ffbf1db5c26f5f48e534c678ef28c42491a6663a (diff) | |
download | nixlib-fccbb5daf3f715de0b09b83822b76b18cd46e9fb.tar nixlib-fccbb5daf3f715de0b09b83822b76b18cd46e9fb.tar.gz nixlib-fccbb5daf3f715de0b09b83822b76b18cd46e9fb.tar.bz2 nixlib-fccbb5daf3f715de0b09b83822b76b18cd46e9fb.tar.lz nixlib-fccbb5daf3f715de0b09b83822b76b18cd46e9fb.tar.xz nixlib-fccbb5daf3f715de0b09b83822b76b18cd46e9fb.tar.zst nixlib-fccbb5daf3f715de0b09b83822b76b18cd46e9fb.zip |
Merge pull request #56034 from peterhoeg/u/sqlite
qscintilla: 2.9.4 -> 2.11.2 and sqlitebrowser: 3.11.2
Diffstat (limited to 'pkgs/development/tools/database')
-rw-r--r-- | pkgs/development/tools/database/sqlitebrowser/default.nix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 7813eba04361..aa29277281d2 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" @@ -32,6 +27,6 @@ mkDerivation rec { homepage = http://sqlitebrowser.org/; license = licenses.gpl3; maintainers = with maintainers; [ ma27 ]; - platforms = platforms.linux; # can only test on linux + platforms = platforms.unix; }; } |