diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-02 10:41:53 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-02 10:41:53 +0100 |
| commit | 26af997d41444e71074c41e82c2eb869b33758f1 (patch) | |
| tree | eb4f7fcc4a71a18c85452c927dedc9d9744ad21f /pkgs/os-specific/linux/kernel/manual-config.nix | |
| parent | 97b24ed95acdd7ad4d7e94b94c0a6eaf3d5fa92a (diff) | |
| parent | a920c50cfbe849c9062de81bde050b5672e4e42c (diff) | |
Merge branch 'master' into stdenv-updates
Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix
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, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 5d84dee0a28d8..b76b0a1039f7d 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, nettools, perl, kmod, writeTextFile }: +{ stdenv, runCommand, nettools, bc, perl, kmod, writeTextFile }: with stdenv.lib; @@ -122,7 +122,7 @@ stdenv.mkDerivation { runHook postConfigure ''; - nativeBuildInputs = [ perl nettools ]; + nativeBuildInputs = [ perl bc nettools ]; makeFlags = commonMakeFlags ++ [ "INSTALLKERNEL=${installkernel stdenv.platform.kernelTarget}" |