nixos/treewide: clean up some more references to deleted qt5 things (#435823) (67f1a96e) · Commits · nix / nixpkgs

nixos/modules/config/qt.nix

+3 −28

Original line number	Diff line number	Diff line
		@@ -17,11 +17,6 @@ let
		qt6Packages.qt6gtk2
		];
		kde = [
		libsForQt5.kio
		libsForQt5.plasma-integration
		libsForQt5.systemsettings
		];
		kde6 = [
		kdePackages.kio
		kdePackages.plasma-integration
		kdePackages.systemsettings
		@@ -36,11 +31,6 @@ let
		];
		};

		# Maps style names to their QT_QPA_PLATFORMTHEME, if necessary.
		styleNames = {
		kde6 = "kde";
		};

		stylePackages = with pkgs; {
		bb10bright = [ libsForQt5.qtstyleplugins ];
		bb10dark = [ libsForQt5.qtstyleplugins ];
		@@ -71,8 +61,8 @@ let
		];

		breeze = [
		libsForQt5.breeze-qt5
		kdePackages.breeze
		kdePackages.breeze.qt5
		];

		kvantum = [
		@@ -111,10 +101,6 @@ in
		relatedPackages = [
		"qgnomeplatform"
		"qgnomeplatform-qt6"
		[
		"libsForQt5"
		"plasma-integration"
		]
		[
		"libsForQt5"
		"qt5ct"
		@@ -123,10 +109,6 @@ in
		"libsForQt5"
		"qtstyleplugins"
		]
		[
		"libsForQt5"
		"systemsettings"
		]
		[
		"kdePackages"
		"plasma-integration"
		@@ -158,8 +140,7 @@ in
		The options are
		- `gnome`: Use GNOME theme with [qgnomeplatform](https://github.com/FedoraQt/QGnomePlatform)
		- `gtk2`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins)
		- `kde`: Use Qt settings from Plasma 5.
		- `kde6`: Use Qt settings from Plasma 6.
		- `kde`: Use Qt settings from Plasma.
		- `lxqt`: Use LXQt style set using the [lxqt-config-appearance](https://github.com/lxqt/lxqt-config)
		application.
		- `qt5ct`: Use Qt style set using the [qt5ct](https://sourceforge.net/projects/qt5ct/)
		@@ -174,10 +155,6 @@ in
		relatedPackages = [
		"adwaita-qt"
		"adwaita-qt6"
		[
		"libsForQt5"
		"breeze-qt5"
		]
		[
		"libsForQt5"
		"qtstyleplugin-kvantum"
		@@ -236,9 +213,7 @@ in
		];

		environment.variables = {
		QT_QPA_PLATFORMTHEME =
		lib.mkIf (cfg.platformTheme != null)
		styleNames.${cfg.platformTheme} or cfg.platformTheme;
		QT_QPA_PLATFORMTHEME = lib.mkIf (cfg.platformTheme != null) cfg.platformTheme;
		QT_STYLE_OVERRIDE = lib.mkIf (cfg.style != null) cfg.style;
		};

nixos/modules/system/boot/loader/grub/grub.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -558,7 +558,7 @@ in

		theme = mkOption {
		type = types.nullOr types.path;
		example = literalExpression ''"''${pkgs.libsForQt5.breeze-grub}/grub/themes/breeze"'';
		example = literalExpression ''"''${pkgs.kdePackages.breeze-grub}/grub/themes/breeze"'';
		default = null;
		description = ''
		Path to the grub theme to be used.