Commit 424d609d authored by K900's avatar K900
Browse files

linux: uncurse arguments 

Currently things like `buildLinux { inherit src version; }` fail because of
`callPackage` auto-inserting `kernelPatches`, which is both a `buildLinux`
argument and a `pkgs` toplevel attribute, with completely different semantics.

Avoid that entirely by splitting the call into two - one for arguments we want
from `callPackage`, and one for everything else.
parent 56db90d2

pkgs/os-specific/linux/kernel/generic.nix

+3 −2
Original line number Diff line number Diff line
@@ -12,8 +12,10 @@ 
, rustc

, rustPlatform

, rust-bindgen

, nixosTests

}:



, # The kernel source tarball.

{ # The kernel source tarball.

  src



, # The kernel version.
@@ -66,7 +68,6 @@ 
, preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false

, kernelArch ? stdenv.hostPlatform.linuxArch

, kernelTests ? []

, nixosTests

, ...

}@args:

pkgs/top-level/linux-kernels.nix

+1 −2
Original line number Diff line number Diff line
@@ -713,6 +713,5 @@ in { 
    '';

  };



  buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs;



  buildLinux = callPackage ../os-specific/linux/kernel/generic.nix {};

}