From b4ea37c633d809eaa1b998f72d9d86c1a6a558cb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 18 Oct 2023 11:58:05 +0100 Subject: [PATCH] qt: remove remaining Qt 4 support Qt 4 was removed from nixpkgs so it doesn't make sense to support it anymore. --- modules/misc/qt.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/modules/misc/qt.nix b/modules/misc/qt.nix index d11976831..314a4a2c5 100644 --- a/modules/misc/qt.nix +++ b/modules/misc/qt.nix @@ -38,7 +38,7 @@ in { options = { qt = { - enable = mkEnableOption "Qt 4, 5 and 6 configuration"; + enable = mkEnableOption "Qt 5 and 6 configuration"; platformTheme = mkOption { type = types.nullOr (types.enum [ "gtk" "gnome" "qtct" "kde" ]); @@ -170,14 +170,5 @@ in { xsession.importedVariables = [ "QT_QPA_PLATFORMTHEME" ] ++ lib.optionals (cfg.style.name != null) [ "QT_STYLE_OVERRIDE" ]; - - # Enable GTK+ style for Qt4 in Gtk/GNOME. - # It doesn’t support the platform theme packages. - home.activation.useGtkThemeInQt4 = - mkIf (cfg.platformTheme == "gtk" || cfg.platformTheme == "gnome") - (hm.dag.entryAfter [ "writeBoundary" ] '' - $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG \ - --set "${config.xdg.configHome}/Trolltech.conf" Qt style GTK+ - ''); }; }