Unverified Commit 7ace9369 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #211003 from lilyinstarlight/fix/qt6-plugin-path 

nixos/qt: set QT_PLUGIN_PATH and QML2_IMPORT_PATH when enabled
parents bd9a31a3 185874df

nixos/modules/config/qt.nix

+10 −2
Original line number Diff line number Diff line
@@ -102,9 +102,17 @@ in 


  config = mkIf cfg.enable {



    environment.variables.QT_QPA_PLATFORMTHEME = cfg.platformTheme;

    environment.variables = {

      QT_QPA_PLATFORMTHEME = cfg.platformTheme;

      QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt || isKde)) cfg.style;

    };



    environment.variables.QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt || isKde)) cfg.style;

    environment.profileRelativeSessionVariables = let

      qtVersions = with pkgs; [ qt5 qt6 ];

    in {

      QT_PLUGIN_PATH = map (qt: "/${qt.qtbase.qtPluginPrefix}") qtVersions;

      QML2_IMPORT_PATH = map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions;

    };



    environment.systemPackages = packages;