diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix
index b9df863d12f9..d5ba80d009b7 100644
--- a/nixos/modules/services/display-managers/sddm.nix
+++ b/nixos/modules/services/display-managers/sddm.nix
@@ -12,9 +12,11 @@ let
   xEnv = config.systemd.services.display-manager.environment;
 
   sddm = cfg.package.override (old: {
-    withWayland = cfg.wayland.enable;
-    withLayerShellQt = cfg.wayland.compositor == "kwin";
-    extraPackages = old.extraPackages or [ ] ++ cfg.extraPackages;
+    extraPackages =
+      old.extraPackages or [ ]
+      ++ lib.optionals cfg.wayland.enable [ pkgs.qt6.qtwayland ]
+      ++ lib.optionals (cfg.wayland.compositor == "kwin") [ pkgs.kdePackages.layer-shell-qt ]
+      ++ cfg.extraPackages;
   });
 
   iniFmt = pkgs.formats.ini { };
@@ -228,7 +230,7 @@ in
         '';
       };
 
-      package = mkPackageOption pkgs [ "libsForQt5" "sddm" ] { };
+      package = mkPackageOption pkgs [ "kdePackages" "sddm" ] { };
 
       enableHidpi = mkOption {
         type = types.bool;
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 7ee30e5a77ac..f4f5e95c8ba6 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -2,23 +2,15 @@
   lib,
   callPackage,
   runCommand,
-  layer-shell-qt ? null,
-  qtwayland,
   wrapQtAppsHook,
   unwrapped ? callPackage ./unwrapped.nix { },
-  withWayland ? false,
-  withLayerShellQt ? false,
   extraPackages ? [ ],
 }:
 runCommand "sddm-wrapped"
   {
     inherit (unwrapped) version outputs;
 
-    buildInputs =
-      unwrapped.buildInputs
-      ++ extraPackages
-      ++ lib.optional withWayland qtwayland
-      ++ lib.optional (withWayland && withLayerShellQt) layer-shell-qt;
+    buildInputs = unwrapped.buildInputs ++ extraPackages;
     nativeBuildInputs = [ wrapQtAppsHook ];
 
     strictDeps = true;
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index f39f342b7036..6fbf6cfd6db0 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -221,10 +221,6 @@ makeScopeWithSplicing' {
 
         qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };
 
-        # Not a library, but we do want it to be built for every qt version there
-        # is, to allow users to choose the right build if needed.
-        sddm = callPackage ../applications/display-managers/sddm { };
-
         signond = callPackage ../development/libraries/signond { };
 
         timed = callPackage ../applications/system/timed { };
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index 7ee501d1f94e..6aae3abf5efd 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -138,8 +138,6 @@ makeScopeWithSplicing' {
         callPackage ../development/libraries/sailfish-access-control-plugin
           { };
 
-      # Not a library, but we do want it to be built for every qt version there
-      # is, to allow users to choose the right build if needed.
       sddm = kdePackages.callPackage ../applications/display-managers/sddm { };
 
       sierra-breeze-enhanced =