diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2018-01-15 22:28:45 -0500 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2018-01-15 22:28:45 -0500 |
| commit | 7bb3a044be38810e525cde73d591e006b2118095 (patch) | |
| tree | 95baa9b37539883e50bbe7c9c2a588e41de160da /pkgs/os-specific/linux | |
| parent | 80f6b8e2ba354f85b48622acf56dde86db0c4e29 (diff) | |
| download | nixlib-7bb3a044be38810e525cde73d591e006b2118095.tar nixlib-7bb3a044be38810e525cde73d591e006b2118095.tar.gz nixlib-7bb3a044be38810e525cde73d591e006b2118095.tar.bz2 nixlib-7bb3a044be38810e525cde73d591e006b2118095.tar.lz nixlib-7bb3a044be38810e525cde73d591e006b2118095.tar.xz nixlib-7bb3a044be38810e525cde73d591e006b2118095.tar.zst nixlib-7bb3a044be38810e525cde73d591e006b2118095.zip | |
kernel: fix dependencies
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 816a1363921a..e00bda692b3c 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -64,7 +64,8 @@ let kernelConfig = kernelConfigFun config; - nativeBuildInputs = [ buildPackages.stdenv.cc perl ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ perl ]; platformName = hostPlatform.platform.name; kernelBaseConfig = hostPlatform.platform.kernelBaseConfig; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 6c598e50a0aa..9a7e96094107 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -236,7 +236,8 @@ stdenv.mkDerivation ((drvAttrs config hostPlatform.platform kernelPatches config enableParallelBuilding = true; - nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr buildPackages.stdenv.cc ] + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 5f79e1b2cac6..1936f6578b6f 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,6 +1,6 @@ { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils -, libiberty, libaudit +, libiberty, libaudit, libbfd , zlib, withGtk ? false, gtk2 ? null }: with lib; @@ -21,10 +21,9 @@ stdenv.mkDerivation { ''; # perf refers both to newt and slang - # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison libiberty libaudit makeWrapper pkgconfig python perl ]; - buildInputs = [ elfutils newt slang libunwind binutils zlib ] ++ + buildInputs = [ elfutils newt slang libunwind libbfd zlib ] ++ stdenv.lib.optional withGtk gtk2; # Note: we don't add elfutils to buildInputs, since it provides a |