diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index c9aecd591354..28c618c29a0e 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt5, sqlite, cmake }: +{ stdenv, fetchFromGitHub, qtbase, qttools, makeQtWrapper, sqlite, cmake }: stdenv.mkDerivation rec { version = "3.9.1"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1s7f2d7wx2i68x60z7wdws3il6m83k5n5w5wyjvr0mz0mih0s150"; }; - buildInputs = [ qt5.qtbase qt5.qttools sqlite cmake ]; + buildInputs = [ qtbase qttools sqlite ]; + nativeBuildInputs = [ makeQtWrapper cmake ]; enableParallelBuilding = true; @@ -19,10 +20,13 @@ stdenv.mkDerivation rec { # A regression was introduced in CMakeLists.txt on v3.9.x # See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755 - patchPhase = '' + postPatch = '' substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)' ''; + postInstall = '' + wrapQtProgram $out/bin/sqlitebrowser + ''; meta = with stdenv.lib; { description = "DB Browser for SQLite"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf85f6c04643..dce94584e034 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6984,7 +6984,7 @@ with pkgs; flex = flex_2_5_35; }; - sqlitebrowser = callPackage ../development/tools/database/sqlitebrowser { }; + sqlitebrowser = qt5.callPackage ../development/tools/database/sqlitebrowser { }; sselp = callPackage ../tools/X11/sselp{ };