diff --git a/pkgs/development/tools/database/sqlitebrowser/macos.patch b/pkgs/by-name/sq/sqlitebrowser/macos.patch similarity index 100% rename from pkgs/development/tools/database/sqlitebrowser/macos.patch rename to pkgs/by-name/sq/sqlitebrowser/macos.patch diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/by-name/sq/sqlitebrowser/package.nix similarity index 87% rename from pkgs/development/tools/database/sqlitebrowser/default.nix rename to pkgs/by-name/sq/sqlitebrowser/package.nix index 5a39d5126526..de32f2e569dd 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/by-name/sq/sqlitebrowser/package.nix @@ -3,11 +3,8 @@ stdenv, fetchFromGitHub, cmake, - qtbase, - qttools, + qt5, sqlcipher, - wrapQtAppsHook, - qtmacextras, }: stdenv.mkDerivation (finalAttrs: { @@ -28,15 +25,15 @@ stdenv.mkDerivation (finalAttrs: { # -qt4 or -qt5 prefix while others do not. # We *really* should get that cleaned up. buildInputs = [ - qtbase + qt5.qtbase sqlcipher ] - ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras; + ++ lib.optional stdenv.hostPlatform.isDarwin qt5.qtmacextras; nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + qt5.qttools + qt5.wrapQtAppsHook ]; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b6bb9777556..2187a7fa3929 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7486,8 +7486,6 @@ with pkgs; protobuf = protobuf_21; }; - sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; - sqlite-utils = with python3Packages; toPythonApplication sqlite-utils; sqlmap = with python3Packages; toPythonApplication sqlmap;