diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-20 15:11:29 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-30 17:20:32 -0400 |
| commit | 2c2f1e37d4374ea61caefd9389927ea03df4ce31 (patch) | |
| tree | 1c0dff3f6483825a9143741bdddca44f35bb4224 /pkgs/build-support | |
| parent | 94f71d800db2ef7afb9fc8dad9e9aa503bfa2941 (diff) | |
| download | nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.gz nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.bz2 nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.lz nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.xz nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.zst nixpkgs-2c2f1e37d4374ea61caefd9389927ea03df4ce31.zip | |
reewide: Purge all uses `stdenv.system` and top-level `system`
It is deprecated and will be removed after 18.09.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv/env.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/release/nix-build.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/vm/windows/controller/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/vm/windows/cygwin-iso/default.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index d951fb9ab06..23568f51b23 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux, system }: +{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }: { name, profile ? "" , targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] @@ -22,7 +22,7 @@ # /lib will link to /lib32 let - is64Bit = system == "x86_64-linux"; + is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64; isMultiBuild = multiPkgs != null && is64Bit; isTargetBuild = !isMultiBuild; diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index d42538c7e5d..feda54de46f 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation ( postPhases = postPhases ++ ["finalPhase"]; meta = (if args ? meta then args.meta else {}) // { - description = if doCoverageAnalysis then "Coverage analysis" else "Nix package for ${stdenv.system}"; + description = if doCoverageAnalysis then "Coverage analysis" else "Nix package for ${stdenv.hostPlatform.system}"; }; } diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 17803a28330..e000308bed8 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -157,7 +157,7 @@ let "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET" ]); - maybeKvm64 = optional (stdenv.system == "x86_64-linux") "-cpu kvm64"; + maybeKvm64 = optional (stdenv.hostPlatform.system == "x86_64-linux") "-cpu kvm64"; cygwinQemuArgs = concatStringsSep " " (maybeKvm64 ++ [ "-monitor unix:$MONITOR_SOCKET,server,nowait" diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index 2c46d5fae90..76cd41a75bc 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -17,7 +17,7 @@ let }; cygwinCross = (import ../../../../.. { - inherit (stdenv) system; + localSystem = stdenv.hostPlatform; crossSystem = { libc = "msvcrt"; platform = {}; |