kernel generic: Don't use stdenv.cross

This commit is contained in:
hsloan 2017-06-28 16:32:25 -04:00 committed by John Ericson
parent c5b4b6c911
commit 459d07d41c
10 changed files with 12 additions and 11 deletions

View file

@ -25,6 +25,7 @@
kernelPatches ? []
, ignoreConfigErrors ? stdenv.platform.name != "pc"
, extraMeta ? {}
, hostPlatform
, ...
}:
@ -59,7 +60,7 @@ let
arch = stdenv.platform.kernelArch;
crossAttrs = let
cp = stdenv.cross.platform;
cp = hostPlatform.platform;
in {
arch = cp.kernelArch;
platformName = cp.name;
@ -128,7 +129,7 @@ let
};
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
configCross = configWithPlatform hostPlatform.platform;
nativeDrv = lib.addPassthru kernel.nativeDrv passthru;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "3.10.105";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.11.7";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.4.73";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.9.34";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, perl, buildLinux, ncurses, ... } @ args:
{ stdenv, hostPlatform, fetchgit, perl, buildLinux, ncurses, ... } @ args:
# ChromiumOS requires a 64bit build host
assert stdenv.is64bit;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args:
{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
let
version = "4.11.7";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
mptcpVersion = "0.91.3";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args:
{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
let
modDirVersion = "4.9.24";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.12-rc6";