public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reewide: Purge all uses stdenv.system and top-level system

Browse Source 
It is deprecated and will be removed after 18.09.
This commit is contained in:
John Ericson
2018-08-20 15:11:29 -04:00
parent 94f71d800d
commit 2c2f1e37d4
263 changed files with 594 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/games/andyetitmoves/default.nix
View File

@@ -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";
}

4
pkgs/games/dwarf-fortress/dfhack/default.nix
View File

@@ -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" ''

6
pkgs/games/dwarf-fortress/game.nix
View File

@@ -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}";

2
pkgs/games/eduke32/default.nix
View File

@@ -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 = ''

4
pkgs/games/ezquake/default.nix
View File

@@ -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 .

2
pkgs/games/factorio/default.nix
View File

@@ -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"

2
pkgs/games/nethack/default.nix
View File

@@ -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"

4
pkgs/games/oilrush/default.nix
View File

@@ -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

2
pkgs/games/openarena/default.nix
View File

@@ -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}"

4
pkgs/games/racer/default.nix
View File

@@ -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

2
pkgs/games/sdlmame/default.nix
View File

@@ -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";

6
pkgs/games/steam/default.nix
View File

@@ -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 { };

4
pkgs/games/ut2004/demo.nix
View File

@@ -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 {

2
pkgs/games/vessel/default.nix
View File

@@ -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;

2
pkgs/games/worldofgoo/default.nix
View File

@@ -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 = ''

2
pkgs/games/zandronum/fmod.nix
View File

@@ -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