sqlitebrowser: move to pkgs/by-name

This commit is contained in:
Peter H. Hoeg 2025-08-05 18:29:58 +02:00 committed by Peter Hoeg
parent e230878c5f
commit 76c1b5e7d9
3 changed files with 5 additions and 10 deletions

View File

@ -3,11 +3,8 @@
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
qtbase, qt5,
qttools,
sqlcipher, sqlcipher,
wrapQtAppsHook,
qtmacextras,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -28,15 +25,15 @@ stdenv.mkDerivation (finalAttrs: {
# -qt4 or -qt5 prefix while others do not. # -qt4 or -qt5 prefix while others do not.
# We *really* should get that cleaned up. # We *really* should get that cleaned up.
buildInputs = [ buildInputs = [
qtbase qt5.qtbase
sqlcipher sqlcipher
] ]
++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras; ++ lib.optional stdenv.hostPlatform.isDarwin qt5.qtmacextras;
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
qttools qt5.qttools
wrapQtAppsHook qt5.wrapQtAppsHook
]; ];
cmakeFlags = [ cmakeFlags = [

View File

@ -7486,8 +7486,6 @@ with pkgs;
protobuf = protobuf_21; protobuf = protobuf_21;
}; };
sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };
sqlite-utils = with python3Packages; toPythonApplication sqlite-utils; sqlite-utils = with python3Packages; toPythonApplication sqlite-utils;
sqlmap = with python3Packages; toPythonApplication sqlmap; sqlmap = with python3Packages; toPythonApplication sqlmap;