diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-01 18:01:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 18:01:40 +0000 |
| commit | 83d6b7a7e06bda96bdba35614fd4bef89d516865 (patch) | |
| tree | ec9f0586b07730e1e3170d6ba5f1a8927ae368f5 /pkgs/os-specific/linux/kernel/manual-config.nix | |
| parent | b8314a334697090d9ffe94c36c8dd41c7933d54f (diff) | |
| parent | bd0051cd54a18cbb4e3c7af4715a9a936818c0ef (diff) | |
| download | nixpkgs-83d6b7a7e06bda96bdba35614fd4bef89d516865.tar nixpkgs-83d6b7a7e06bda96bdba35614fd4bef89d516865.tar.gz nixpkgs-83d6b7a7e06bda96bdba35614fd4bef89d516865.tar.bz2 nixpkgs-83d6b7a7e06bda96bdba35614fd4bef89d516865.tar.lz nixpkgs-83d6b7a7e06bda96bdba35614fd4bef89d516865.tar.xz nixpkgs-83d6b7a7e06bda96bdba35614fd4bef89d516865.tar.zst nixpkgs-83d6b7a7e06bda96bdba35614fd4bef89d516865.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 421b234b634..51ab51fb83c 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -19,6 +19,8 @@ in { stdenv, # The kernel version version, + # Position of the Linux build expression + pos ? null, # Additional kernel make flags extraMakeFlags ? [], # The version of the kernel module directory @@ -339,4 +341,4 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ] ++ extraMakeFlags; karch = stdenv.hostPlatform.linuxArch; -}) +} // (optionalAttrs (pos != null) { inherit pos; })) |