diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2017-02-15 13:46:02 -0500 |
---|---|---|
committer | John Ericson <Ericson2314@Yahoo.com> | 2017-05-17 15:06:09 -0400 |
commit | f0e1907beed52608e1ff65eb6b30cbbcd7170132 (patch) | |
tree | 7eef282a769957d07125ef4d711f394fb3617ab8 | |
parent | 5870795cc68b29681ca644a8802fa11b469f2095 (diff) | |
download | nixlib-f0e1907beed52608e1ff65eb6b30cbbcd7170132.tar nixlib-f0e1907beed52608e1ff65eb6b30cbbcd7170132.tar.gz nixlib-f0e1907beed52608e1ff65eb6b30cbbcd7170132.tar.bz2 nixlib-f0e1907beed52608e1ff65eb6b30cbbcd7170132.tar.lz nixlib-f0e1907beed52608e1ff65eb6b30cbbcd7170132.tar.xz nixlib-f0e1907beed52608e1ff65eb6b30cbbcd7170132.tar.zst nixlib-f0e1907beed52608e1ff65eb6b30cbbcd7170132.zip |
linuxHeadersCross: Remove and just use `linuxHeaders`
-rw-r--r-- | pkgs/top-level/all-packages.nix | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fdfc9ca649b..1abdf7d2d0c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7707,7 +7707,7 @@ with pkgs; glibcCross = forcedNativePackages.glibc.override { gccCross = gccCrossStageStatic; - linuxHeaders = linuxHeadersCross; + inherit (forcedNativePackages) linuxHeaders; }; # We can choose: @@ -11684,25 +11684,30 @@ with pkgs; lkl = callPackage ../applications/virtualization/lkl { }; - linuxHeaders = linuxHeaders_4_4; - - linuxHeaders24Cross = forcedNativePackages.callPackage ../os-specific/linux/kernel-headers/2.4.nix { - cross = assert targetPlatform != buildPlatform; targetPlatform; + linuxHeaders_2_4 = callPackage ../os-specific/linux/kernel-headers/2.4.nix { + cross = if targetPlatform != hostPlatform then targetPlatform else null; }; - linuxHeaders26Cross = forcedNativePackages.callPackage ../os-specific/linux/kernel-headers/4.4.nix { - cross = assert targetPlatform != buildPlatform; targetPlatform; + linuxHeaders_2_6 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { + cross = if targetPlatform != hostPlatform then targetPlatform else null; }; - linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { }; + linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { + cross = if targetPlatform != hostPlatform then targetPlatform else null; + }; # We can choose: - linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross - else if ver == "2.6" then linuxHeaders26Cross - else throw "Unknown linux kernel version"; - - linuxHeadersCross = assert targetPlatform != buildPlatform; - linuxHeadersCrossChooser targetPlatform.platform.kernelMajor; + linuxHeaders = + if targetPlatform != hostPlatform + then + { # switch + "2.4" = linuxHeaders_2_4; + "2.6" = linuxHeaders_2_6; + "4.4" = linuxHeaders_4_4; + }.${targetPlatform.platform.kernelMajor} + or (throw "Unknown linux kernel version") + else + linuxHeaders_4_4; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; @@ -12358,7 +12363,7 @@ with pkgs; uclibc = callPackage ../os-specific/linux/uclibc { }; uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc { - linuxHeaders = linuxHeadersCross; + inherit (buildPackages) linuxHeaders; gccCross = gccCrossStageStatic; cross = assert targetPlatform != buildPlatform; targetPlatform; }); |