Merge pull request #26884 from obsidiansystems/purge-stdenv-cross

Purge stdenv cross
2017-06-28 21:39:16 -04:00
parent 425e9ce493 9f156f4a8a
commit e1faeb574a
83 changed files with 305 additions and 344 deletions
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, bc, dtc, python2 }:
+{ stdenv, fetchurl, bc, dtc, python2
+, hostPlatform
+}:

 let
  buildUBoot = { targetPlatforms
@@ -43,8 +45,8 @@ let

    crossAttrs = {
      makeFlags = [
-        "ARCH=${stdenv.cross.platform.kernelArch}"
-        "CROSS_COMPILE=${stdenv.cross.config}-"
+        "ARCH=${hostPlatform.platform.kernelArch}"
+        "CROSS_COMPILE=${stdenv.cc.prefix}"
      ];
    };