diff options
| author | Euan Kemp <euank@euank.com> | 2020-06-13 14:41:22 -0700 |
|---|---|---|
| committer | Euan Kemp <euank@euank.com> | 2020-06-14 00:10:47 -0700 |
| commit | 727e7d8039ca11aff682e39bf3817f09012cf924 (patch) | |
| tree | 65d0a93ee188d54e67e9ddce137f53878e8207f8 /pkgs/games/steam | |
| parent | 7602241fbd4e1336638399a9c63c97a43c3e22ca (diff) | |
| download | nixpkgs-727e7d8039ca11aff682e39bf3817f09012cf924.tar nixpkgs-727e7d8039ca11aff682e39bf3817f09012cf924.tar.gz nixpkgs-727e7d8039ca11aff682e39bf3817f09012cf924.tar.bz2 nixpkgs-727e7d8039ca11aff682e39bf3817f09012cf924.tar.lz nixpkgs-727e7d8039ca11aff682e39bf3817f09012cf924.tar.xz nixpkgs-727e7d8039ca11aff682e39bf3817f09012cf924.tar.zst nixpkgs-727e7d8039ca11aff682e39bf3817f09012cf924.zip | |
steam: switch to correct runtime tarball
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.
Diffstat (limited to 'pkgs/games/steam')
| -rw-r--r-- | pkgs/games/steam/runtime.nix | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 44d80c0d794..6d81d6c775e 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -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; { |