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 | |
parent | 359e6446efcf47735f594c74d4b3f2571bc75316 (diff) | |
download | nixlib-77661f8cfde49992338daf7d0bdd35eb93d65624.tar nixlib-77661f8cfde49992338daf7d0bdd35eb93d65624.tar.gz nixlib-77661f8cfde49992338daf7d0bdd35eb93d65624.tar.bz2 nixlib-77661f8cfde49992338daf7d0bdd35eb93d65624.tar.lz nixlib-77661f8cfde49992338daf7d0bdd35eb93d65624.tar.xz nixlib-77661f8cfde49992338daf7d0bdd35eb93d65624.tar.zst nixlib-77661f8cfde49992338daf7d0bdd35eb93d65624.zip |
nixos/plasma5: drop enableQt4Support option
Phonon no longer supports Qt4 so this is useless.
5 files changed, 9 insertions, 17 deletions
diff --git a/nixos/doc/manual/configuration/profiles/graphical.xml b/nixos/doc/manual/configuration/profiles/graphical.xml index 73e3abc59d0c..cc6d0825d241 100644 --- a/nixos/doc/manual/configuration/profiles/graphical.xml +++ b/nixos/doc/manual/configuration/profiles/graphical.xml @@ -13,9 +13,7 @@ <para> It sets <xref linkend="opt-services.xserver.enable"/>, <xref linkend="opt-services.xserver.displayManager.sddm.enable"/>, - <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> ( - <link linkend="opt-services.xserver.desktopManager.plasma5.enableQt4Support"> - without Qt4 Support</link>), and + <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/>, and <xref linkend="opt-services.xserver.libinput.enable"/> to true. It also includes glxinfo and firefox in the system packages list. </para> diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 1ea07679dab5..6916fd225dac 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -171,6 +171,11 @@ setting <literal>serviceConfig.PrivateTmp</literal> to <literal>false</literal> for each phpfpm unit. </para> </listitem> + <listitem> + <para> + KDE’s old multimedia framework Phonon no longer supports Qt 4. For that reason, Plasma desktop also does not have <option>enableQt4Support</option> option any more. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index 6a10a6404e67..e00d3f7535b2 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -11,7 +11,6 @@ with lib; services.xserver = { desktopManager.plasma5 = { enable = true; - enableQt4Support = false; }; # Automatically login as nixos. diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index ac3c228b3c65..d80456cede56 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -9,7 +9,6 @@ displayManager.sddm.enable = true; desktopManager.plasma5 = { enable = true; - enableQt4Support = false; }; libinput.enable = true; # for touchpad support on many laptops }; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index b48ca3fad939..da8bdcb78c43 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 ] |