git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #90286 from euank/steam-fix-runtime
fecdbdaChristoph Hrdinka
pkgs/games/steam/runtime.nix+7−12
@@ -1,4 +1,4 @@
1−{ stdenv, steamArch, fetchurl, }:
1+{ stdenv, fetchurl }:
2
2
3stdenv.mkDerivation rec {
3stdenv.mkDerivation rec {
4
4
@@ -6,20 +6,15 @@ stdenv.mkDerivation rec {
6 # from https://repo.steampowered.com/steamrt-images-scout/snapshots/
6 # from https://repo.steampowered.com/steamrt-images-scout/snapshots/
7 version = "0.20200417.0";
7 version = "0.20200417.0";
8
8
9− src =
9+ src = fetchurl {
10− if steamArch == "amd64" then fetchurl {
11− url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/com.valvesoftware.SteamRuntime.Platform-amd64,i386-scout-runtime.tar.gz";
10+ url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
12− sha256 = "0kps8i5v23sycqm69xz389n8k831jd7ncsmlrkky7nib2q91rbvj";
11+ sha256 = "0d4dfl6i31i8187wj8rr9yvmrg32bx96bsgs2ya21b00czf070sy";
13− name = "scout-runtime-${version}.tar.gz";
14− } else fetchurl {
15− url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/com.valvesoftware.SteamRuntime.Platform-i386-scout-runtime.tar.gz";
16− sha256 = "03fhac1r25xf7ia2pd35wjw360v5pa9h4870yrhhygp9h7v4klzf";
17− name = "scout-runtime-i386-${version}.tar.gz";
12+ name = "scout-runtime-${version}.tar.gz";
18− };
13+ };
19
14
20 buildCommand = ''
15 buildCommand = ''
21 mkdir -p $out
16 mkdir -p $out
22− tar -C $out -x --strip=1 -f $src files/
17+ tar -C $out --strip=1 -x -f $src
23 '';
18 '';
24
19
25 meta = with stdenv.lib; {
20 meta = with stdenv.lib; {