nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-16 18:03:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "linux: default stdenv.hostPlatform.linux-kernel"

Browse Source 
This reverts commit febe477628.
This commit is contained in:
Adam Joseph 2023-07-25 14:41:57 -07:00
parent 06f20db451
commit ddaa949afe
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -47,7 +47,7 @@
# symbolic name and `patch' is the actual patch. The patch may
# optionally be compressed with gzip or bzip2.
kernelPatches ? []
, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name or "" != "pc"
, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc"
, extraMeta ? {}
, isZen ? false
@ -55,7 +55,7 @@
, isHardened ? false
# easy overrides to stdenv.hostPlatform.linux-kernel members
, autoModules ? stdenv.hostPlatform.linux-kernel.autoModules or true
, autoModules ? stdenv.hostPlatform.linux-kernel.autoModules
, preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false
, kernelArch ? stdenv.hostPlatform.linuxArch
, kernelTests ? []
@ -128,10 +128,11 @@ let
++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ]
++ lib.optional (lib.versionAtLeast version "5.2") pahole;
platformName = stdenv.hostPlatform.linux-kernel.name;
# e.g. "defconfig"
kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig or "defconfig";
kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig;
# e.g. "bzImage"
kernelTarget = stdenv.hostPlatform.linux-kernel.target or "vmlinux";
kernelTarget = stdenv.hostPlatform.linux-kernel.target;
makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags
++ extraMakeFlags;

9
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -87,8 +87,7 @@ let
isModular = config.isYes "MODULES";
kernelConf = stdenv.hostPlatform.linux-kernel;
target = kernelConf.target or "vmlinux";
kernelConf = stdenv.hostPlatform.linux-kernel;
buildDTBs = kernelConf.DTB or false;
in
@ -102,7 +101,7 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal ]
++ optional (target == "uImage") buildPackages.ubootTools
++ optional (kernelConf.target == "uImage") buildPackages.ubootTools
++ optional (lib.versionOlder version "5.8") libelf
++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]
++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ]
@ -298,8 +297,8 @@ stdenv.mkDerivation ({
# Some image types need special install targets (e.g. uImage is installed with make uinstall)
installTargets = [
(kernelConf.installTarget or (
/**/ if target == "uImage" then "uinstall"
else if target == "zImage" || target == "Image.gz" then "zinstall"
/**/ if kernelConf.target == "uImage" then "uinstall"
else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall"
else "install"))
];