summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/manual-config.nix
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2023-07-25 14:41:57 -0700
committerAdam Joseph <adam@westernsemico.com>2023-07-28 12:32:02 -0700
commitddaa949afe18949396a1de532df60ffaea5bf2a3 (patch)
tree177cae9a1c2de0c7967281b9f29c61414c91347f /pkgs/os-specific/linux/kernel/manual-config.nix
parent06f20db451844c5f048e99e3e3f6870ae998c9e5 (diff)
downloadnixpkgs-ddaa949afe18949396a1de532df60ffaea5bf2a3.tar
nixpkgs-ddaa949afe18949396a1de532df60ffaea5bf2a3.tar.gz
nixpkgs-ddaa949afe18949396a1de532df60ffaea5bf2a3.tar.bz2
nixpkgs-ddaa949afe18949396a1de532df60ffaea5bf2a3.tar.lz
nixpkgs-ddaa949afe18949396a1de532df60ffaea5bf2a3.tar.xz
nixpkgs-ddaa949afe18949396a1de532df60ffaea5bf2a3.tar.zst
nixpkgs-ddaa949afe18949396a1de532df60ffaea5bf2a3.zip
Revert "linux: default stdenv.hostPlatform.linux-kernel"
This reverts commit febe4776287fd81b9dc0fd88a8bcb686765c8a6b.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/manual-config.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 9908d22c411..4a623fda9be 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -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"))
   ];