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

Merge pull request #232284 from K900/what-if-steam-but-no-steam 

steam: build the fhsenv on Hydra
parents c11cd401 1ec761c9

pkgs/games/steam/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ let 
      inherit buildFHSEnv;

    };

    steam-fhsenv-small = steam-fhsenv.override { withGameSpecificLibraries = false; };



    # This has to exist so Hydra tries to build all of Steam's dependencies.

    # FIXME: Maybe we should expose it as something more generic?

    steam-fhsenv-without-steam = steam-fhsenv.override { steam = null; };



    steamcmd = callPackage ./steamcmd.nix { };

  };

  keep = self: { };

pkgs/games/steam/fhsenv.nix

+13 −7
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ in buildFHSEnv rec { 
  name = "steam";



  targetPkgs = pkgs: with pkgs; [

    steamPackages.steam

    steam

    # License agreement

    gnome.zenity

  ] ++ commonTargetPkgs pkgs;
@@ -207,10 +207,10 @@ in buildFHSEnv rec { 
    libpsl

    nghttp2.lib

    rtmpdump

  ] ++ steamPackages.steam-runtime-wrapped.overridePkgs

  ] ++ steam-runtime-wrapped.overridePkgs

  ++ extraLibraries pkgs;



  extraInstallCommands = ''

  extraInstallCommands = lib.optionalString (steam != null) ''

    mkdir -p $out/share/applications

    ln -s ${steam}/share/icons $out/share

    ln -s ${steam}/share/pixmaps $out/share
@@ -262,8 +262,14 @@ in buildFHSEnv rec { 
    exec steam ${extraArgs} "$@"

  '';



  meta = steam.meta // lib.optionalAttrs (!withGameSpecificLibraries) {

  meta =

    if steam != null

    then

      steam.meta // lib.optionalAttrs (!withGameSpecificLibraries) {

        description = steam.meta.description + " (without game specific libraries)";

      }

    else {

      description = "Steam dependencies (dummy package, do not use)";

    };



  # allows for some gui applications to share IPC
@@ -298,7 +304,7 @@ in buildFHSEnv rec { 
      exec -- "$run" "$@"

    '';



    meta = steam.meta // {

    meta = (steam.meta or {}) // {

      description = "Run commands in the same FHS environment that is used for Steam";

      name = "steam-run";

    };

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -36914,7 +36914,7 @@ with pkgs; 














  stockfish = callPackage ../games/stockfish { };



























  steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { });













  steamPackages = recurseIntoAttrs (callPackage ../games/steam { });





























  steam = steamPackages.steam-fhsenv;















  steam-small = steamPackages.steam-fhsenv-small;