alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

steam: switch to correct runtime tarball

Browse source 
In my previous commit (593c28b) I used the wrong upstream artifact for
the runtime. After reading the documentation in the
ValveSoftware/steam-runtime repo, I now know that the steam-runtime
tarball is what I actually wanted.

I also used 'diff' to compare the various artifacts with the old runtime
this package used before, and the steam-runtime one is certainly the
closest.

Most importantly, switching to the right steam-runtime package
reportedly fixes issues for other users (fixes #90229).

This also entirely removes the amd64/i386 split from runtime.nix because
the upstream package bundles both together, and if that's how upstream
wants to distribute this, it seems best to follow their lead.
This commit is contained in:
Euan Kemp 2020-06-13 14:41:22 -07:00
parent 7602241fbd
commit 727e7d8039
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/games/steam/runtime.nix
View file

@ -1,4 +1,4 @@
{ stdenv, steamArch, fetchurl, }:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
@ -6,20 +6,15 @@ stdenv.mkDerivation rec {
# from https://repo.steampowered.com/steamrt-images-scout/snapshots/
version = "0.20200417.0";
src =
if steamArch == "amd64" then fetchurl {
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/com.valvesoftware.SteamRuntime.Platform-amd64,i386-scout-runtime.tar.gz";
sha256 = "0kps8i5v23sycqm69xz389n8k831jd7ncsmlrkky7nib2q91rbvj";
name = "scout-runtime-${version}.tar.gz";
} else fetchurl {
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/com.valvesoftware.SteamRuntime.Platform-i386-scout-runtime.tar.gz";
sha256 = "03fhac1r25xf7ia2pd35wjw360v5pa9h4870yrhhygp9h7v4klzf";
name = "scout-runtime-i386-${version}.tar.gz";
};
src = fetchurl {
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
sha256 = "0d4dfl6i31i8187wj8rr9yvmrg32bx96bsgs2ya21b00czf070sy";
name = "scout-runtime-${version}.tar.gz";
};
buildCommand = ''
mkdir -p $out
tar -C $out -x --strip=1 -f $src files/
tar -C $out --strip=1 -x -f $src
'';
meta = with stdenv.lib; {