From 5d986dcfca3b39858647cbdb3b35a0568f1e1c1f Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Tue, 3 Jun 2025 17:31:25 +0200 Subject: [PATCH 1/5] steam-unwrapped: 1.0.0.82 -> 1.0.0.83 --- pkgs/by-name/st/steam-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix index dcb374f48437..57ca2d102008 100644 --- a/pkgs/by-name/st/steam-unwrapped/package.nix +++ b/pkgs/by-name/st/steam-unwrapped/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "steam-unwrapped"; - version = "1.0.0.82"; + version = "1.0.0.83"; src = fetchurl { # use archive url so the tarball doesn't 404 on a new release url = "https://repo.steampowered.com/steam/archive/stable/steam_${finalAttrs.version}.tar.gz"; - hash = "sha256-r6Lx3WJx/StkW6MLjzq0Cv02VONUJBoxy9UQAPfm/Hc="; + hash = "sha256-eRaCsMx+/ZRscAL5F8ndR00mGbf57QCJEhaoprSsj4I="; }; patches = [ From 913d9a936cb59c797eb6dbb61abb13d4ca112f98 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Wed, 4 Jun 2025 15:55:08 +0200 Subject: [PATCH 2/5] steam-unwrapped: `--replace` -> `--replace-fail` --- pkgs/by-name/st/steam-unwrapped/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix index 57ca2d102008..32159fd86b0e 100644 --- a/pkgs/by-name/st/steam-unwrapped/package.nix +++ b/pkgs/by-name/st/steam-unwrapped/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/etc/udev/rules.d/ cp ./subprojects/steam-devices/*.rules $out/etc/udev/rules.d/ substituteInPlace $out/etc/udev/rules.d/60-steam-input.rules \ - --replace "/bin/sh" "${bash}/bin/bash" + --replace-fail "/bin/sh" "${bash}/bin/bash" # this just installs a link, "steam.desktop -> /lib/steam/steam.desktop" rm $out/share/applications/steam.desktop From 952de82a2b24ad785e5f15425509c31d41fbf839 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Wed, 4 Jun 2025 15:57:48 +0200 Subject: [PATCH 3/5] steam-unwrapped: remove `with lib;` --- pkgs/by-name/st/steam-unwrapped/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix index 32159fd86b0e..c9c5e0cec510 100644 --- a/pkgs/by-name/st/steam-unwrapped/package.nix +++ b/pkgs/by-name/st/steam-unwrapped/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = ./update.py; - meta = with lib; { + meta = { description = "Digital distribution platform"; longDescription = '' Steam is a video game digital distribution service and storefront from Valve. @@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: { To install on NixOS, please use the option `programs.steam.enable = true`. ''; homepage = "https://store.steampowered.com/"; - license = licenses.unfreeRedistributable; - maintainers = [ lib.maintainers.jagajaga ]; - teams = [ lib.teams.steam ]; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ jagajaga ]; + teams = with lib.teams; [ steam ]; mainProgram = "steam"; }; }) From 6427e30613afe4e487de22e0601bf525fccda3f7 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Wed, 4 Jun 2025 15:58:53 +0200 Subject: [PATCH 4/5] steam-unwrapped: `DESTDIR` -> `PREFIX`, use `placeholder` in `makeFlags` --- pkgs/by-name/st/steam-unwrapped/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix index c9c5e0cec510..f3a21165a181 100644 --- a/pkgs/by-name/st/steam-unwrapped/package.nix +++ b/pkgs/by-name/st/steam-unwrapped/package.nix @@ -23,8 +23,7 @@ stdenv.mkDerivation (finalAttrs: { ]; makeFlags = [ - "DESTDIR=$(out)" - "PREFIX=" + "PREFIX=${placeholder "out"}" ]; postInstall = '' From 6486c717cf62b2860821ca9136c2cf6a9023cdd2 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Wed, 4 Jun 2025 16:00:41 +0200 Subject: [PATCH 5/5] steam-unwrapped: replace `sed` usage with `substitute` --- pkgs/by-name/st/steam-unwrapped/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix index f3a21165a181..236caad9062a 100644 --- a/pkgs/by-name/st/steam-unwrapped/package.nix +++ b/pkgs/by-name/st/steam-unwrapped/package.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation (finalAttrs: { # this just installs a link, "steam.desktop -> /lib/steam/steam.desktop" rm $out/share/applications/steam.desktop - sed -e 's,/usr/bin/steam,steam,g' steam.desktop > $out/share/applications/steam.desktop + substitute steam.desktop $out/share/applications/steam.desktop \ + --replace-fail /usr/bin/steam steam ''; passthru.updateScript = ./update.py;