From 600e977898d776faee44ccf74ba53315e1347d4e Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 8 Mar 2018 12:45:39 +0900 Subject: [PATCH] buildLinux: removes unnecessary parameters and passes parameters in a single set --- pkgs/os-specific/linux/kernel/generic.nix | 12 +++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index f69865cdc4d..a8f55d81466 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -1,12 +1,10 @@ -{ buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl +{ buildPackages , ncurses -, libelf -, utillinux -, writeTextFile, ubootTools , callPackage -}: - -{ stdenv, buildPackages, perl, buildLinux +, perl +, bison ? null +, flex ? null +, stdenv , # The kernel source tarball. src diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98001c416fa..ac39582a1a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13445,7 +13445,7 @@ with pkgs; # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); - buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/generic.nix {}); + buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; keyutils = callPackage ../os-specific/linux/keyutils { };