Unverified Commit dd12f1e9 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #314970 from NixOS/backport-312268-to-release-24.05 

[Backport release-24.05] nixos/steam: add option `extraPackages` `fontPackages`, fix CJK fonts on client
parents 4d34890c 7f86c884

nixos/modules/programs/steam.nix

+28 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ in { 
            then [ package ] ++ extraPackages

            else [ package32 ] ++ extraPackages32;

        in prevLibs ++ additionalLibs;

        extraPkgs = p: (cfg.extraPackages ++ lib.optionals (prev ? extraPkgs) (prev.extraPkgs p));

      } // lib.optionalAttrs (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice)

      {

        buildFHSEnv = pkgs.buildFHSEnv.override {
@@ -69,6 +70,19 @@ in { 
      '';

    };



    extraPackages = lib.mkOption {

      type = lib.types.listOf lib.types.package;

      default = [ ];

      example = lib.literalExpression ''

        with pkgs; [

          gamescope

        ]

      '';

      description = ''

        Additional packages to add to the Steam environment.

      '';

    };



    extraCompatPackages = lib.mkOption {

      type = lib.types.listOf lib.types.package;

      default = [ ];
@@ -86,6 +100,18 @@ in { 
      '';

    };



    fontPackages = lib.mkOption {

      type = lib.types.listOf lib.types.package;

      default = config.fonts.packages;

      defaultText = lib.literalExpression "fonts.packages";

      example = lib.literalExpression "with pkgs; [ source-han-sans ]";

      description = ''

        Font packages to use in Steam.



        Defaults to system fonts, but could be overridden to use other fonts — useful for users who would like to customize CJK fonts used in Steam. According to the [upstream issue](https://github.com/ValveSoftware/steam-for-linux/issues/10422#issuecomment-1944396010), Steam only follows the per-user fontconfig configuration.

      '';

    };



    remotePlay.openFirewall = lib.mkOption {

      type = lib.types.bool;

      default = false;
@@ -158,6 +184,8 @@ in { 
      };

    };



    programs.steam.extraPackages = cfg.fontPackages;



    programs.gamescope.enable = lib.mkDefault cfg.gamescopeSession.enable;

    services.displayManager.sessionPackages = lib.mkIf cfg.gamescopeSession.enable [ gamescopeSessionFile ];