diff options
author | Peter Hoeg <peter@hoeg.com> | 2017-11-02 15:16:24 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2017-11-06 13:07:52 +0800 |
commit | dd18e063ef681aab4f67454ad385fe4b21331458 (patch) | |
tree | 0c06022b34bf1ffac925e799e47315a278edf3f6 /pkgs/development/tools/database/sqlitebrowser | |
parent | cfafd6f5a819472911eaf2650b50a62f0c143e3e (diff) | |
download | nixlib-dd18e063ef681aab4f67454ad385fe4b21331458.tar nixlib-dd18e063ef681aab4f67454ad385fe4b21331458.tar.gz nixlib-dd18e063ef681aab4f67454ad385fe4b21331458.tar.bz2 nixlib-dd18e063ef681aab4f67454ad385fe4b21331458.tar.lz nixlib-dd18e063ef681aab4f67454ad385fe4b21331458.tar.xz nixlib-dd18e063ef681aab4f67454ad385fe4b21331458.tar.zst nixlib-dd18e063ef681aab4f67454ad385fe4b21331458.zip |
sqlitebrowser: 3.10.0 -> 3.10.1 and make it work with Qt 5.9
Diffstat (limited to 'pkgs/development/tools/database/sqlitebrowser')
-rw-r--r-- | pkgs/development/tools/database/sqlitebrowser/default.nix | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index adeb377dccd0..74adac9f8a32 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,32 +1,39 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }: +{ mkDerivation, lib, fetchFromGitHub, cmake, antlr +, qtbase, qttools, qscintilla, sqlite }: mkDerivation rec { - version = "3.10.0"; + version = "3.10.1"; name = "sqlitebrowser-${version}"; src = fetchFromGitHub { repo = "sqlitebrowser"; owner = "sqlitebrowser"; rev = "v${version}"; - sha256 = "1fwr7p4b6glc3s0a06i7cg8l9p1mrcm4vyhyf2wi89cyg22rrf5c"; + sha256 = "1brzam8yv6sbdmbqsp7vglhd6wlx49g2ap8llr271zrkld4k3kar"; }; - buildInputs = [ qtbase qttools sqlite ]; - nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase qscintilla sqlite ]; - cmakeFlags = [ "-DUSE_QT5=TRUE" ]; + nativeBuildInputs = [ cmake antlr qttools ]; - # A regression was introduced in CMakeLists.txt on v3.9.x - # See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755 + 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 'project("DB Browser for SQLite")' 'project(sqlitebrowser)' + 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/; license = licenses.gpl3; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux; # can only test on linux }; } |