From 2b619c23146b7b791ed25a174add5cc8d99c8654 Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 14 Mar 2024 23:54:02 +0100 Subject: nixos/steam: use steamcompattool output for extraCompatPackages This sets a standard for Steam compat tools in NixOS where they must have the compat tool in a special steamcompattool output. proton-ge-bin was adjusted to conform with it. --- nixos/modules/programs/steam.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'nixos/modules/programs') diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 31803f061dce..8fc0f35c0dce 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -44,8 +44,8 @@ in { ''; apply = steam: steam.override (prev: { extraEnv = (lib.optionalAttrs (cfg.extraCompatPackages != [ ]) { - STEAM_EXTRA_COMPAT_TOOLS_PATHS = makeBinPath cfg.extraCompatPackages; - }) // (prev.extraEnv or {}); + STEAM_EXTRA_COMPAT_TOOLS_PATHS = makeSearchPathOutput "steamcompattool" "" cfg.extraCompatPackages; + }) // (prev.extraEnv or {}); extraLibraries = pkgs: let prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ]; additionalLibs = with config.hardware.opengl; @@ -77,7 +77,9 @@ in { description = lib.mdDoc '' Extra packages to be used as compatibility tools for Steam on Linux. Packages will be included in the `STEAM_EXTRA_COMPAT_TOOLS_PATHS` environmental variable. For more information see - . + https://github.com/ValveSoftware/steam-for-linux/issues/6310. + + These packages must be Steam compatibility tools that have a `steamcompattool` output. ''; }; -- cgit 1.4.1 From bdc55d2f8671881b81d6797928b3e7569235b1ba Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 16 Mar 2024 12:07:52 +0100 Subject: nixos/steam: provide example in extraCompatPackages --- nixos/modules/programs/steam.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'nixos/modules/programs') diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 8fc0f35c0dce..c93a34f61849 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -74,6 +74,11 @@ in { extraCompatPackages = mkOption { type = types.listOf types.package; default = [ ]; + example = literalExpression '' + with pkgs; [ + proton-ge-bin + ] + ''; description = lib.mdDoc '' Extra packages to be used as compatibility tools for Steam on Linux. Packages will be included in the `STEAM_EXTRA_COMPAT_TOOLS_PATHS` environmental variable. For more information see -- cgit 1.4.1