diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-07-06 11:30:29 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-07-06 11:32:05 -0700 |
| commit | 284d76ee3ddfde84bcc491f45d7e322da02bbae6 (patch) | |
| tree | 43a5cf2592ad3fba6053a264b8b6c3a817130197 /pkgs/os-specific/linux/kernel/manual-config.nix | |
| parent | d60110fd977181eb70c85534b88f757d4755a2f1 (diff) | |
| download | nixpkgs-284d76ee3ddfde84bcc491f45d7e322da02bbae6.tar nixpkgs-284d76ee3ddfde84bcc491f45d7e322da02bbae6.tar.gz nixpkgs-284d76ee3ddfde84bcc491f45d7e322da02bbae6.tar.bz2 nixpkgs-284d76ee3ddfde84bcc491f45d7e322da02bbae6.tar.lz nixpkgs-284d76ee3ddfde84bcc491f45d7e322da02bbae6.tar.xz nixpkgs-284d76ee3ddfde84bcc491f45d7e322da02bbae6.tar.zst nixpkgs-284d76ee3ddfde84bcc491f45d7e322da02bbae6.zip | |
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.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 5 |
1 files changed, 4 insertions, 1 deletions
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)" |