lol

nixos/plasma5: drop enableQt4Support option

Phonon no longer supports Qt4 so this is useless.

+9 -17
+1 -3
nixos/doc/manual/configuration/profiles/graphical.xml
··· 13 13 <para> 14 14 It sets <xref linkend="opt-services.xserver.enable"/>, 15 15 <xref linkend="opt-services.xserver.displayManager.sddm.enable"/>, 16 - <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> ( 17 - <link linkend="opt-services.xserver.desktopManager.plasma5.enableQt4Support"> 18 - without Qt4 Support</link>), and 16 + <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/>, and 19 17 <xref linkend="opt-services.xserver.libinput.enable"/> to true. It also 20 18 includes glxinfo and firefox in the system packages list. 21 19 </para>
+5
nixos/doc/manual/release-notes/rl-2003.xml
··· 171 171 setting <literal>serviceConfig.PrivateTmp</literal> to <literal>false</literal> for each phpfpm unit. 172 172 </para> 173 173 </listitem> 174 + <listitem> 175 + <para> 176 + 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. 177 + </para> 178 + </listitem> 174 179 </itemizedlist> 175 180 </section> 176 181
-1
nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
··· 11 11 services.xserver = { 12 12 desktopManager.plasma5 = { 13 13 enable = true; 14 - enableQt4Support = false; 15 14 }; 16 15 17 16 # Automatically login as nixos.
-1
nixos/modules/profiles/graphical.nix
··· 9 9 displayManager.sddm.enable = true; 10 10 desktopManager.plasma5 = { 11 11 enable = true; 12 - enableQt4Support = false; 13 12 }; 14 13 libinput.enable = true; # for touchpad support on many laptops 15 14 };
+3 -12
nixos/modules/services/x11/desktop-managers/plasma5.nix
··· 27 27 example = "vlc"; 28 28 description = "Phonon audio backend to install."; 29 29 }; 30 - 31 - enableQt4Support = mkOption { 32 - type = types.bool; 33 - default = true; 34 - description = '' 35 - Enable support for Qt 4-based applications. Particularly, install a 36 - default backend for Phonon. 37 - ''; 38 - }; 39 - 40 30 }; 41 31 42 32 }; 43 33 34 + imports = [ 35 + (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "enableQt4Support" ] "Phonon no longer supports Qt 4.") 36 + ]; 44 37 45 38 config = mkMerge [ 46 39 (mkIf cfg.enable { ··· 173 166 174 167 # Phonon audio backend 175 168 ++ lib.optional (cfg.phononBackend == "gstreamer") libsForQt5.phonon-backend-gstreamer 176 - ++ lib.optional (cfg.phononBackend == "gstreamer" && cfg.enableQt4Support) pkgs.phonon-backend-gstreamer 177 169 ++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc 178 - ++ lib.optional (cfg.phononBackend == "vlc" && cfg.enableQt4Support) pkgs.phonon-backend-vlc 179 170 180 171 # Optional hardware support features 181 172 ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt ]