public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: fix dependencies

Browse Source
This commit is contained in:
Ben Wolsieffer 2018-01-15 22:28:45 -05:00
parent 80f6b8e2ba
commit 7bb3a044be
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -64,7 +64,8 @@ let
kernelConfig = kernelConfigFun config; kernelConfig = kernelConfigFun config;
nativeBuildInputs = [ buildPackages.stdenv.cc perl ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ];
platformName = hostPlatform.platform.name; platformName = hostPlatform.platform.name;
kernelBaseConfig = hostPlatform.platform.kernelBaseConfig; kernelBaseConfig = hostPlatform.platform.kernelBaseConfig;

3
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -236,7 +236,8 @@ stdenv.mkDerivation ((drvAttrs config hostPlatform.platform kernelPatches config
enableParallelBuilding = true; 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.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.14") libelf ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux

5
pkgs/os-specific/linux/kernel/perf.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper
, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils
, libiberty, libaudit , libiberty, libaudit, libbfd
, zlib, withGtk ? false, gtk2 ? null }: , zlib, withGtk ? false, gtk2 ? null }:
with lib; with lib;
@ -21,10 +21,9 @@ stdenv.mkDerivation {
''; '';
# perf refers both to newt and slang # perf refers both to newt and slang
# binutils is required for libbfd.
nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
flex bison libiberty libaudit makeWrapper pkgconfig python perl ]; 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; stdenv.lib.optional withGtk gtk2;
# Note: we don't add elfutils to buildInputs, since it provides a # Note: we don't add elfutils to buildInputs, since it provides a