Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #31120 from peterhoeg/f/sqlite
sqlitebrowser: 3.10.0 -> 3.10.1 and make it work with Qt 5.9
- Loading branch information
Showing
2 changed files
with
18 additions
and
11 deletions.
There are no files selected for viewing
27 changes: 17 additions & 10 deletions
27
pkgs/development/tools/database/sqlitebrowser/default.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters