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

steam (and friends): migrate to by-name, small cleanups all over (#349109)

parents 37da9858 5c33791d

nixos/modules/hardware/steam-hardware.nix

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ in 


  config = lib.mkIf cfg.enable {

    services.udev.packages = [

      pkgs.steamPackages.steam

      pkgs.steam-unwrapped

    ];



    # The uinput module needs to be loaded in order to trigger the udev rules

pkgs/games/steam/steam.nix→pkgs/by-name/st/steam-unwrapped/package.nix

+5 −17
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, runtimeShell, traceDeps ? false, bash }:

{ lib, stdenv, fetchurl, bash }:



stdenv.mkDerivation (finalAttrs: {

  pname = "steam-original";

  pname = "steam-unwrapped";

  version = "1.0.0.81";



  src = fetchurl {
@@ -12,20 +12,8 @@ stdenv.mkDerivation (finalAttrs: { 


  makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];



  postInstall =

  let

   traceLog = "/tmp/steam-trace-dependencies.log";

  in ''

  postInstall = ''

    rm $out/bin/steamdeps

    ${lib.optionalString traceDeps ''

      cat > $out/bin/steamdeps <<EOF

      #!${runtimeShell}

      echo \$1 >> ${traceLog}

      cat \$1 >> ${traceLog}

      echo >> ${traceLog}

      EOF

      chmod +x $out/bin/steamdeps

    ''}



    # install udev rules

    mkdir -p $out/etc/udev/rules.d/
@@ -38,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { 
    sed -e 's,/usr/bin/steam,steam,g' steam.desktop > $out/share/applications/steam.desktop

  '';



  passthru.updateScript = ./update-bootstrap.py;

  passthru.updateScript = ./update.py;



  meta = with lib; {

    description = "Digital distribution platform";
@@ -49,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { 
    '';

    homepage = "https://store.steampowered.com/";

    license = licenses.unfreeRedistributable;

    maintainers = with maintainers; [ jagajaga ];

    maintainers = lib.teams.steam.members ++ [ lib.maintainers.jagajaga ];

    mainProgram = "steam";

  };

})

pkgs/games/steam/update-bootstrap.py→pkgs/by-name/st/steam-unwrapped/update.py

+1 −1
Original line number Diff line number Diff line
@@ -27,5 +27,5 @@ if len(found_versions) == 0: 
    sys.exit(1)



found_versions.sort()

subprocess.run(["nix-update", "--version", found_versions[-1], "steamPackages.steam"])

subprocess.run(["nix-update", "--version", found_versions[-1], "steam-unwrapped"])

found_versions[0]

pkgs/games/steam/fhsenv.nix→pkgs/by-name/st/steam/package.nix

+6 −6
Original line number Diff line number Diff line 
{

  lib,

  steam,

  steam-unwrapped,

  buildFHSEnv,

  writeShellScript,

  extraPkgs ? pkgs: [ ], # extra packages to add to targetPkgs
@@ -21,7 +21,7 @@ let 


    # https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/blob/main/docs/distro-assumptions.md#command-line-tools

    targetPkgs = pkgs: with pkgs; [

      steam

      steam-unwrapped



      bash

      coreutils
@@ -63,8 +63,8 @@ let 
      libcap  # not documented, required by srt-bwrap

    ] ++ extraLibraries pkgs;



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

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

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

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

    '';



    profile = ''
@@ -124,7 +124,7 @@ in steamEnv { 
      exec "$@"

    '';



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

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

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

      mainProgram = "steam-run";

      name = "steam-run";
@@ -135,7 +135,7 @@ in steamEnv { 
    };

  };



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

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

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

  };

}