diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-23 00:48:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 00:48:29 +0000 |
| commit | 28fd8e0d598ad27ecece751827396ab765a6a34e (patch) | |
| tree | c28cd15292529e434d2c7d5272371aa3c1b3e2a2 /nixos/modules/services/x11/display-managers | |
| parent | e0d458ed2c77bfed6db792a5dd94392871cacc3f (diff) | |
| parent | 00f6d352bd4598bdcd6b5c9884430e9e2d6084a6 (diff) | |
| download | nixpkgs-28fd8e0d598ad27ecece751827396ab765a6a34e.tar nixpkgs-28fd8e0d598ad27ecece751827396ab765a6a34e.tar.gz nixpkgs-28fd8e0d598ad27ecece751827396ab765a6a34e.tar.bz2 nixpkgs-28fd8e0d598ad27ecece751827396ab765a6a34e.tar.lz nixpkgs-28fd8e0d598ad27ecece751827396ab765a6a34e.tar.xz nixpkgs-28fd8e0d598ad27ecece751827396ab765a6a34e.tar.zst nixpkgs-28fd8e0d598ad27ecece751827396ab765a6a34e.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/x11/display-managers')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/sddm.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index a39bb55b38c..23b4d8ffb13 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -9,12 +9,7 @@ let cfg = dmcfg.sddm; xEnv = config.systemd.services.display-manager.environment; - sddm = if config.services.xserver.desktopManager.lxqt.enable then - # TODO: Move lxqt to libsForQt515 - pkgs.libsForQt514.sddm - else - pkgs.libsForQt5.sddm - ; + sddm = pkgs.libsForQt5.sddm; xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh |