about summary refs log tree commit diff
path: root/pkgs/development/tools/database/sqlitebrowser
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2020-06-22 17:19:35 +0800
committerGitHub <noreply@github.com>2020-06-22 11:19:35 +0200
commitfea4603212a1ddcdffe4cb49c44e7e4fa60824b1 (patch)
treeb4b815f2c11b4b7ecf51f3d62b5f568927652d18 /pkgs/development/tools/database/sqlitebrowser
parent554e90cae7e9103a66c6b16e3a5888f292731f72 (diff)
sqlitebrowser: 3.11.2 -> 3.12.0 (#91271)
Diffstat (limited to 'pkgs/development/tools/database/sqlitebrowser')
-rw-r--r--pkgs/development/tools/database/sqlitebrowser/default.nix24
1 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index f8a8ee70e9d63..7fcdbd1a6ad82 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,30 +1,30 @@
 { mkDerivation, lib, fetchFromGitHub, cmake, antlr
-, qtbase, qttools, qscintilla, sqlite }:
+, qtbase, qttools, sqlite }:
 
 mkDerivation rec {
   pname = "sqlitebrowser";
-  version = "3.11.2";
+  version = "3.12.0";
 
   src = fetchFromGitHub {
-    owner  = pname;
-    repo   = pname;
-    rev    = "v${version}";
-    sha256 = "0ydd5fg76d5d23byac1f7f8mzx3brmd0cnnkd58qpmlzi7p9hcvx";
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "1arv4rzl8s1vjjqzz35l2b1rfzr2b8b23v97fdw1kdxpwvs63l99";
   };
 
-  buildInputs = [ antlr qtbase qscintilla sqlite ];
+  # We should be using qscintilla from nixpkgs instead of the vendored version,
+  # but qscintilla is currently in a bit of a mess as some consumers expect a
+  # -qt4 or -qt5 prefix while others do not.
+  # We *really* should get that cleaned up.
+  buildInputs = [ antlr qtbase sqlite ];
 
   nativeBuildInputs = [ cmake qttools ];
 
-  NIX_LDFLAGS = "-lQt5PrintSupport";
-
-  enableParallelBuilding = true;
-
   meta = with lib; {
     description = "DB Browser for SQLite";
     homepage = "https://sqlitebrowser.org/";
     license = licenses.gpl3;
-    maintainers = with maintainers; [  ];
+    maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.unix;
   };
 }