kernel generic: Don't use stdenv.cross

authored by hsloan and committed by John Ericson 459d07d4 c5b4b6c9

+12 -11
+3 -2
pkgs/os-specific/linux/kernel/generic.nix
··· 25 kernelPatches ? [] 26 , ignoreConfigErrors ? stdenv.platform.name != "pc" 27 , extraMeta ? {} 28 , ... 29 }: 30 ··· 59 arch = stdenv.platform.kernelArch; 60 61 crossAttrs = let 62 - cp = stdenv.cross.platform; 63 in { 64 arch = cp.kernelArch; 65 platformName = cp.name; ··· 128 }; 129 130 config = configWithPlatform stdenv.platform; 131 - configCross = configWithPlatform stdenv.cross.platform; 132 133 nativeDrv = lib.addPassthru kernel.nativeDrv passthru; 134
··· 25 kernelPatches ? [] 26 , ignoreConfigErrors ? stdenv.platform.name != "pc" 27 , extraMeta ? {} 28 + , hostPlatform 29 , ... 30 }: 31 ··· 60 arch = stdenv.platform.kernelArch; 61 62 crossAttrs = let 63 + cp = hostPlatform.platform; 64 in { 65 arch = cp.kernelArch; 66 platformName = cp.name; ··· 129 }; 130 131 config = configWithPlatform stdenv.platform; 132 + configCross = configWithPlatform hostPlatform.platform; 133 134 nativeDrv = lib.addPassthru kernel.nativeDrv passthru; 135
+1 -1
pkgs/os-specific/linux/kernel/linux-3.10.nix
··· 1 - { stdenv, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 version = "3.10.105";
··· 1 + { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 version = "3.10.105";
+1 -1
pkgs/os-specific/linux/kernel/linux-4.11.nix
··· 1 - { stdenv, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 version = "4.11.7";
··· 1 + { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 version = "4.11.7";
+1 -1
pkgs/os-specific/linux/kernel/linux-4.4.nix
··· 1 - { stdenv, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 version = "4.4.73";
··· 1 + { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 version = "4.4.73";
+1 -1
pkgs/os-specific/linux/kernel/linux-4.9.nix
··· 1 - { stdenv, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 version = "4.9.34";
··· 1 + { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 version = "4.9.34";
+1 -1
pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
··· 1 - { stdenv, fetchgit, perl, buildLinux, ncurses, ... } @ args: 2 3 # ChromiumOS requires a 64bit build host 4 assert stdenv.is64bit;
··· 1 + { stdenv, hostPlatform, fetchgit, perl, buildLinux, ncurses, ... } @ args: 2 3 # ChromiumOS requires a 64bit build host 4 assert stdenv.is64bit;
+1 -1
pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
··· 1 - { stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args: 2 3 let 4 version = "4.11.7";
··· 1 + { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: 2 3 let 4 version = "4.11.7";
+1 -1
pkgs/os-specific/linux/kernel/linux-mptcp.nix
··· 1 - { stdenv, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 mptcpVersion = "0.91.3";
··· 1 + { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 mptcpVersion = "0.91.3";
+1 -1
pkgs/os-specific/linux/kernel/linux-rpi.nix
··· 1 - { stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args: 2 3 let 4 modDirVersion = "4.9.24";
··· 1 + { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: 2 3 let 4 modDirVersion = "4.9.24";
+1 -1
pkgs/os-specific/linux/kernel/linux-testing.nix
··· 1 - { stdenv, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 version = "4.12-rc6";
··· 1 + { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: 2 3 import ./generic.nix (args // rec { 4 version = "4.12-rc6";