summary refs log tree commit diff
diff options
context:
space:
mode:
authorCarles Pagès <page@cubata.homelinux.net>2013-02-19 20:34:54 +0100
committerEvgeny Egorochkin <phreedom@yandex.ru>2013-08-10 06:08:18 +0300
commit97ea8d61e6673cdfd85a8aa8e0ec42ee91c93e1c (patch)
tree0c87e4b68d821d2486df8adb61c7837e9cba95e9
parent3f4557b0ebd3254cdf274fc24ad9e7e234805231 (diff)
downloadnixlib-97ea8d61e6673cdfd85a8aa8e0ec42ee91c93e1c.tar
nixlib-97ea8d61e6673cdfd85a8aa8e0ec42ee91c93e1c.tar.gz
nixlib-97ea8d61e6673cdfd85a8aa8e0ec42ee91c93e1c.tar.bz2
nixlib-97ea8d61e6673cdfd85a8aa8e0ec42ee91c93e1c.tar.lz
nixlib-97ea8d61e6673cdfd85a8aa8e0ec42ee91c93e1c.tar.xz
nixlib-97ea8d61e6673cdfd85a8aa8e0ec42ee91c93e1c.tar.zst
nixlib-97ea8d61e6673cdfd85a8aa8e0ec42ee91c93e1c.zip
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.
-rw-r--r--pkgs/games/steam/default.nix18
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 95fcdc0252ab..dd8c5e883a5b 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 179bba1ce760..aabb57b2db02 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 { };