From 97ea8d61e6673cdfd85a8aa8e0ec42ee91c93e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Tue, 19 Feb 2013 20:34:54 +0100 Subject: [PATCH] steam: add amd64 version and point url to fix version (as suggested by aristid). Valve has a repository with fixed version packages, so use that instead of the steam.deb I was using. They also have amd64 packages there. --- pkgs/games/steam/default.nix | 18 +++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 95fcdc0252a..dd8c5e883a5 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -8,17 +8,25 @@ , curl, mesa # Superbrothers: S&S EP , patchelf }: -assert stdenv.system == "i686-linux"; +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let version = "1.0.0.28"; in stdenv.mkDerivation rec { name = "steam-${version}"; - src = fetchurl { - url = "http://media.steampowered.com/client/installer/steam.deb"; - sha256 = "0c0n1v9rnn6jj2wrvbmi77j9v93f3ndw039z9db6092yqls1amqk"; - }; + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://repo.steampowered.com/steam/archive/precise/steam_${version}_i386.deb"; + sha256 = "0c0n1v9rnn6jj2wrvbmi77j9v93f3ndw039z9db6092yqls1amqk"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://repo.steampowered.com/steam/archive/precise/steam64_${version}_amd64.deb"; + sha256 = "1dr2b9s036w8r46az1f9cjddrjaf8a9k564g65j288y6w9pcdb2w"; + } + else throw "Steam not supported on this platform."; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 179bba1ce76..aabb57b2db0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9034,7 +9034,7 @@ let stardust = callPackage ../games/stardust {}; - steam = callPackage_i686 ../games/steam {}; + steam = callPackage ../games/steam {}; stuntrally = callPackage ../games/stuntrally { };