From 2c2f1e37d4374ea61caefd9389927ea03df4ce31 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 20 Aug 2018 15:11:29 -0400 Subject: reewide: Purge all uses `stdenv.system` and top-level `system` It is deprecated and will be removed after 18.09. --- pkgs/games/dwarf-fortress/dfhack/default.nix | 4 ++-- pkgs/games/dwarf-fortress/game.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/games/dwarf-fortress') diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index a7b059bb689..4a8c84cf92d 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 f57e9703fab..2547bb83f3f 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}"; -- cgit 1.4.1