diff options
author | Naïm Favier <n@monade.li> | 2022-12-20 14:42:38 +0100 |
---|---|---|
committer | Naïm Favier <n@monade.li> | 2022-12-22 01:42:15 +0100 |
commit | 6c563f30fe9415fff6ab33df738a7b9ddc84cf4e (patch) | |
tree | bef8e3c34ab63c1603c6491c65f8393f82bb67a3 /pkgs/top-level/linux-kernels.nix | |
parent | f677cbabe93e039a9d4ac995a49f9ca7991d0a9c (diff) |
linuxManualConfig: don't require lib and stdenv arguments
Reverts https://github.com/NixOS/nixpkgs/commit/7c7c83e2335c3aa6f26a4f9c905c49c430b5be09 which was only needed for the minimal-kernel.nix test module and clutters the call site. stdenv can still be overridden with `linuxManualConfig.override { stdenv = ...; }`.
Diffstat (limited to 'pkgs/top-level/linux-kernels.nix')
-rw-r--r-- | pkgs/top-level/linux-kernels.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index da4270896f67d..d6c9bd3ceeaef 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -593,11 +593,11 @@ in { linux_hardkernel_latest = packages.hardkernel_4_14; }; - manualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); + manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix {}; customPackage = { version, src, modDirVersion ? lib.versions.pad 3 version, configfile, allowImportFromDerivation ? true }: recurseIntoAttrs (packagesFor (manualConfig { - inherit version src modDirVersion configfile lib stdenv allowImportFromDerivation; + inherit version src modDirVersion configfile allowImportFromDerivation; })); # Derive one of the default .config files |