summaryrefslogtreecommitdiffstats
path: root/pkgs/games
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-08-20 15:11:29 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-08-30 17:20:32 -0400
commit2c2f1e37d4374ea61caefd9389927ea03df4ce31 (patch)
tree1c0dff3f6483825a9143741bdddca44f35bb4224 /pkgs/games
parent94f71d800db2ef7afb9fc8dad9e9aa503bfa2941 (diff)
reewide: Purge all uses `stdenv.system` and top-level `system`
It is deprecated and will be removed after 18.09.
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/andyetitmoves/default.nix8
-rw-r--r--pkgs/games/dwarf-fortress/dfhack/default.nix4
-rw-r--r--pkgs/games/dwarf-fortress/game.nix6
-rw-r--r--pkgs/games/eduke32/default.nix2
-rw-r--r--pkgs/games/ezquake/default.nix4
-rw-r--r--pkgs/games/factorio/default.nix2
-rw-r--r--pkgs/games/nethack/default.nix2
-rw-r--r--pkgs/games/oilrush/default.nix4
-rw-r--r--pkgs/games/openarena/default.nix2
-rw-r--r--pkgs/games/racer/default.nix4
-rw-r--r--pkgs/games/sdlmame/default.nix2
-rw-r--r--pkgs/games/steam/default.nix6
-rw-r--r--pkgs/games/ut2004/demo.nix4
-rw-r--r--pkgs/games/vessel/default.nix2
-rw-r--r--pkgs/games/worldofgoo/default.nix2
-rw-r--r--pkgs/games/zandronum/fmod.nix2
16 files changed, 28 insertions, 28 deletions
diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix
index 092f07737084..97cbe616c57c 100644
--- a/pkgs/games/andyetitmoves/default.nix
+++ b/pkgs/games/andyetitmoves/default.nix
@@ -7,9 +7,9 @@ in
stdenv.mkDerivation rec {
name = "${plainName}-${version}";
- src = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
+ src = if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"
then
- let postfix = if stdenv.system == "i686-linux" then "i386" else "x86_64";
+ let postfix = if stdenv.hostPlatform.system == "i686-linux" then "i386" else "x86_64";
commercialName = "${plainName}-${version}_${postfix}.tar.gz";
demoUrl = "http://www.andyetitmoves.net/demo/${plainName}Demo-${version}_${postfix}.tar.gz";
in
@@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
directory where yousaved it.
'';
name = commercialName;
- sha256 = if stdenv.system == "i686-linux"
+ sha256 = if stdenv.hostPlatform.system == "i686-linux"
then "15wvzmmidvykwjrbnq70h5jrvnjx1hcrm0357qj85q4aqbzavh01"
else "1v8z16qa9ka8sf7qq45knsxj87s6sipvv3a7xq11pb5xk08fb2ql";
}
else fetchurl {
url = demoUrl;
- sha256 = if stdenv.system == "i686-linux"
+ sha256 = if stdenv.hostPlatform.system == "i686-linux"
then "0f14vrrbq05hsbdajrb5y9za65fpng1lc8f0adb4aaz27x7sh525"
else "0mg41ya0b27blq3b5498kwl4rj46dj21rcd7qd0rw1kyvr7sx4v4";
}
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index a7b059bb6892..4a8c84cf92dc 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -13,8 +13,8 @@ let
xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094";
arch =
- if stdenv.system == "x86_64-linux" then "64"
- else if stdenv.system == "i686-linux" then "32"
+ if stdenv.hostPlatform.system == "x86_64-linux" then "64"
+ else if stdenv.hostPlatform.system == "i686-linux" then "32"
else throw "Unsupported architecture";
fakegit = writeScriptBin "git" ''
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index f57e9703fabf..2547bb83f3f5 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -33,9 +33,9 @@ let
game = if hasAttr dfVersion df-hashes
then getAttr dfVersion df-hashes
else throw "Unknown Dwarf Fortress version: ${dfVersion}";
- dfPlatform = if hasAttr stdenv.system platforms
- then getAttr stdenv.system platforms
- else throw "Unsupported system: ${stdenv.system}";
+ dfPlatform = if hasAttr stdenv.hostPlatform.system platforms
+ then getAttr stdenv.hostPlatform.system platforms
+ else throw "Unsupported system: ${stdenv.hostPlatform.system}";
sha256 = if hasAttr dfPlatform game
then getAttr dfPlatform game
else throw "Unsupported dfPlatform: ${dfPlatform}";
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 733b6070b1fc..502a554bae22 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ flac gtk2 libvorbis libvpx libGLU_combined SDL2 SDL2_mixer ]
- ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
+ ++ stdenv.lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm;
nativeBuildInputs = [ pkgconfig ];
postPatch = ''
diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix
index 14885e7a3b2b..85433e116fbc 100644
--- a/pkgs/games/ezquake/default.nix
+++ b/pkgs/games/ezquake/default.nix
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
];
installPhase = with stdenv.lib; let
- sys = last (splitString "-" stdenv.system);
- arch = head (splitString "-" stdenv.system);
+ sys = last (splitString "-" stdenv.hostPlatform.system);
+ arch = head (splitString "-" stdenv.hostPlatform.system);
in ''
mkdir -p $out/bin
find .
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index d0ffa10baeca..bb019e570260 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -46,7 +46,7 @@ let
};
};
};
- actual = binDists.${stdenv.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform");
+ actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform");
bdistForArch = arch: { sha256 ? null
, version ? "0.16.51"
diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index 3f9ec93f8618..2a39e3499ed9 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -6,7 +6,7 @@
let
platform =
if stdenv.hostPlatform.isUnix then "unix"
- else throw "Unknown platform for NetHack: ${stdenv.system}";
+ else throw "Unknown platform for NetHack: ${stdenv.hostPlatform.system}";
unixHint =
if x11Mode then "linux-x11"
else if qtMode then "linux-qt4"
diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix
index d637c1595954..319cdb610ca6 100644
--- a/pkgs/games/oilrush/default.nix
+++ b/pkgs/games/oilrush/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
assert url != null && sha256 != null;
fetchurl { inherit url sha256; };
shell = stdenv.shell;
- arch = if stdenv.system == "x86_64-linux" then "x64"
- else if stdenv.system == "i686-linux" then "x86"
+ arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
+ else if stdenv.hostPlatform.system == "i686-linux" then "x86"
else "";
unpackPhase = ''
mkdir oilrush
diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix
index 22ce05cb38a7..19e608f393a1 100644
--- a/pkgs/games/openarena/default.nix
+++ b/pkgs/games/openarena/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
cd $out
unzip $src
- ${if stdenv.system == "x86_64-linux" then ''
+ ${if stdenv.hostPlatform.system == "x86_64-linux" then ''
patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.x86_64"
makeWrapper "${gameDir}/openarena.x86_64" "$out/bin/openarena" \
--prefix LD_LIBRARY_PATH : "${libPath}"
diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix
index 4cbc5397bb3e..d11315cd6dfa 100644
--- a/pkgs/games/racer/default.nix
+++ b/pkgs/games/racer/default.nix
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
name = "racer-1.1";
- src = if stdenv.system == "i686-linux" then fetchurl {
+ src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
url = http://hippo.nipax.cz/src/racer-1.1.tar.gz;
sha256 = "0fll1qkqfcjq87k0jzsilcw701z92lfxn2y5ga1n038772lymxl9";
- } else if stdenv.system == "x86_64-linux" then fetchurl {
+ } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
url = https://hippo.nipax.cz/src/racer-1.1.64.tar.gz;
sha256 = "0rjy3gmlhwfkb9zs58j0mc0dar0livwpbc19r6zw5r2k6r7xdan0";
} else
diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix
index fa498b8e0411..9f90c9f14aac 100644
--- a/pkgs/games/sdlmame/default.nix
+++ b/pkgs/games/sdlmame/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
version = "0.151.u0-1";
name = "sdlmame-${version}";
- src = if stdenv.system == "x86_64-linux"
+ src = if stdenv.hostPlatform.system == "x86_64-linux"
then fetchurl {
url = "http://seblu.net/a/archive/packages/s/sdlmame/${name}-x86_64.pkg.tar.xz";
sha256 = "1j9vjxhrhsskrlk5wr7al4wk2hh3983kcva42mqal09bmc8qg3m9";
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index b7dbba552698..e8a911bebd5e 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -4,9 +4,9 @@ let
callPackage = newScope self;
self = rec {
- steamArch = if pkgs.stdenv.system == "x86_64-linux" then "amd64"
- else if pkgs.stdenv.system == "i686-linux" then "i386"
- else throw "Unsupported platform: ${pkgs.stdenv.system}";
+ steamArch = if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "amd64"
+ else if pkgs.stdenv.hostPlatform.system == "i686-linux" then "i386"
+ else throw "Unsupported platform: ${pkgs.stdenv.hostPlatform.system}";
steam-runtime = callPackage ./runtime.nix { };
steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix
index 1a7ea2da75b6..9aea992ac750 100644
--- a/pkgs/games/ut2004/demo.nix
+++ b/pkgs/games/ut2004/demo.nix
@@ -2,8 +2,8 @@
let
arch =
- if stdenv.system == "x86_64-linux" then "amd64"
- else if stdenv.system == "i686-linux" then "x86"
+ if stdenv.hostPlatform.system == "x86_64-linux" then "amd64"
+ else if stdenv.hostPlatform.system == "i686-linux" then "x86"
else throw "Unsupported architecture";
in stdenv.mkDerivation rec {
diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix
index 62feeb97d521..ab6f1ca765ce 100644
--- a/pkgs/games/vessel/default.nix
+++ b/pkgs/games/vessel/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
message = goBuyItNow;
name = "${name}-bin";
sha256 = "1vpwcrjiln2mx43h7ib3jnccyr3chk7a5x2bw9kb4lw8ycygvg96";
- } else throw "unsupported platform ${stdenv.system} only i686-linux supported for now.";
+ } else throw "unsupported platform ${stdenv.hostPlatform.system} only i686-linux supported for now.";
phases = "installPhase";
ld_preload = ./isatty.c;
diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix
index 9684f3b876a8..ad86072dd1ca 100644
--- a/pkgs/games/worldofgoo/default.nix
+++ b/pkgs/games/worldofgoo/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
then "WorldOfGooDemo-1.41"
else "WorldofGoo-1.41";
- arch = if stdenv.system == "x86_64-linux" then "supported"
+ arch = if stdenv.hostPlatform.system == "x86_64-linux" then "supported"
else throw "Sorry. World of Goo only is only supported on x86_64 now.";
goBuyItNow = ''
diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix
index 2c53d93e4011..a5d9098242bd 100644
--- a/pkgs/games/zandronum/fmod.nix
+++ b/pkgs/games/zandronum/fmod.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, alsaLib, libpulseaudio, undmg }:
let
- bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
+ bits = stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64";
libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libpulseaudio ];
in