public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sqlitebrowser: do not use vendored qscintilla

Browse Source
This commit is contained in:
Peter Hoeg 2019-08-26 19:03:42 +08:00
parent 76ad2796be
commit 96f5d7941a
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/tools/database/sqlitebrowser/default.nix
View File

@ -1,25 +1,20 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, antlr { mkDerivation, lib, fetchFromGitHub, cmake, antlr
, qtbase, qttools, sqlite }: , qtbase, qttools, qscintilla, sqlite }:
mkDerivation rec { mkDerivation rec {
version = "3.11.2";
pname = "sqlitebrowser"; pname = "sqlitebrowser";
version = "3.11.2";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = pname;
owner = pname; owner = pname;
repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0ydd5fg76d5d23byac1f7f8mzx3brmd0cnnkd58qpmlzi7p9hcvx"; sha256 = "0ydd5fg76d5d23byac1f7f8mzx3brmd0cnnkd58qpmlzi7p9hcvx";
}; };
buildInputs = [ qtbase sqlite ]; buildInputs = [ antlr qtbase qscintilla sqlite ];
nativeBuildInputs = [ cmake antlr qttools ]; nativeBuildInputs = [ cmake 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 = [ NIX_LDFLAGS = [
"-lQt5PrintSupport" "-lQt5PrintSupport"