summary refs log tree commit diff
path: root/pkgs/development/tools/database/sqlitebrowser/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/tools/database/sqlitebrowser/default.nix')
-rw-r--r--pkgs/development/tools/database/sqlitebrowser/default.nix17
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 7813eba0436..aa29277281d 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;
   };
 }