From 284d76ee3ddfde84bcc491f45d7e322da02bbae6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 6 Jul 2023 11:30:29 -0700 Subject: linuxManualConfig: restore functionality of isModular and buildDTBs Since https://github.com/NixOS/nixpkgs/pull/221707 the `isModular` and `buildDTBs` parameters no longer function properly -- they now control only whether or not these elements are copied to the outpath; they are build unconditionally in any case. This commit reverts the part of #221707 which caused this behavior change. --- pkgs/os-specific/linux/kernel/manual-config.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix') diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 677cc9363da..60175f805a6 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -232,7 +232,10 @@ stdenv.mkDerivation ({ # replicated here to apply to older versions. # Makes __FILE__ relative to the build directory. "KCPPFLAGS=-fmacro-prefix-map=$(sourceRoot)/=" - ] ++ extraMakeFlags; + kernelConf.target + ] ++ optional isModular "modules" + ++ optional buildDTBs "dtbs" + ++ extraMakeFlags; installFlags = [ "INSTALL_PATH=$(out)" -- cgit 1.4.1