diff --git a/pkgs/by-name/li/libdbiDrivers/package.nix b/pkgs/by-name/li/libdbiDrivers/package.nix
index a1211dfce3e3..2e4640e85f89 100644
--- a/pkgs/by-name/li/libdbiDrivers/package.nix
+++ b/pkgs/by-name/li/libdbiDrivers/package.nix
@@ -3,10 +3,12 @@
   stdenv,
   fetchurl,
   libdbi,
-  # TODO: migrate away from overriding packages to null
-  libmysqlclient ? null,
-  sqlite ? null,
-  libpq ? null,
+  withMysql ? true,
+  libmysqlclient,
+  withSqlite ? true,
+  sqlite,
+  withLibpg ? true,
+  libpq,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     libdbi
     sqlite
   ]
-  ++ lib.optional (libmysqlclient != null) libmysqlclient;
+  ++ lib.optional withMysql libmysqlclient;
 
   patches = [
     # https://sourceforge.net/p/libdbi-drivers/libdbi-drivers/ci/24f48b86c8988ee3aaebc5f303d71e9d789f77b6
@@ -47,17 +49,17 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-dbi-incdir=${libdbi}/include"
     "--with-dbi-libdir=${libdbi}/lib"
   ]
-  ++ lib.optionals (libmysqlclient != null) [
+  ++ lib.optionals withMysql [
     "--with-mysql"
     "--with-mysql-incdir=${lib.getDev libmysqlclient}/include/mysql"
     "--with-mysql-libdir=${libmysqlclient}/lib/mysql"
   ]
-  ++ lib.optionals (sqlite != null) [
+  ++ lib.optionals withSqlite [
     "--with-sqlite3"
     "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"
     "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite"
   ]
-  ++ lib.optionals (libpq != null) [
+  ++ lib.optionals withLibpg [
     "--with-pgsql"
     "--with-pgsql-incdir=${libpq.dev}/include"
     "--with-pgsql-libdir=${libpq}/lib/"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77e494af4b89..0d8df65291c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6840,8 +6840,8 @@ with pkgs;
   libchipcard = callPackage ../development/libraries/aqbanking/libchipcard.nix { };
 
   libdbiDriversBase = libdbiDrivers.override {
-    libmysqlclient = null;
-    sqlite = null;
+    withMysql = false;
+    withSqlite = false;
   };
 
   libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };