diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-21 21:54:49 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-11-22 09:01:05 +0100 |
| commit | 77661f8cfde49992338daf7d0bdd35eb93d65624 (patch) | |
| tree | 5b38851df714f55e57edfb3a65bf131408003e69 /nixos/modules/services/x11/desktop-managers/plasma5.nix | |
| parent | 359e6446efcf47735f594c74d4b3f2571bc75316 (diff) | |
| download | nixpkgs-77661f8cfde49992338daf7d0bdd35eb93d65624.tar nixpkgs-77661f8cfde49992338daf7d0bdd35eb93d65624.tar.gz nixpkgs-77661f8cfde49992338daf7d0bdd35eb93d65624.tar.bz2 nixpkgs-77661f8cfde49992338daf7d0bdd35eb93d65624.tar.lz nixpkgs-77661f8cfde49992338daf7d0bdd35eb93d65624.tar.xz nixpkgs-77661f8cfde49992338daf7d0bdd35eb93d65624.tar.zst nixpkgs-77661f8cfde49992338daf7d0bdd35eb93d65624.zip | |
nixos/plasma5: drop enableQt4Support option
Phonon no longer supports Qt4 so this is useless.
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers/plasma5.nix')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index b48ca3fad93..da8bdcb78c4 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -27,20 +27,13 @@ in example = "vlc"; description = "Phonon audio backend to install."; }; - - enableQt4Support = mkOption { - type = types.bool; - default = true; - description = '' - Enable support for Qt 4-based applications. Particularly, install a - default backend for Phonon. - ''; - }; - }; }; + imports = [ + (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "enableQt4Support" ] "Phonon no longer supports Qt 4.") + ]; config = mkMerge [ (mkIf cfg.enable { @@ -173,9 +166,7 @@ in # Phonon audio backend ++ lib.optional (cfg.phononBackend == "gstreamer") libsForQt5.phonon-backend-gstreamer - ++ lib.optional (cfg.phononBackend == "gstreamer" && cfg.enableQt4Support) pkgs.phonon-backend-gstreamer ++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc - ++ lib.optional (cfg.phononBackend == "vlc" && cfg.enableQt4Support) pkgs.phonon-backend-vlc # Optional hardware support features ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt ] |