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

Merge pull request #72287 from oxalica/fix-linux-config

Browse Source 
linuxConfig: fix deps and cross-compiling behavior
This commit is contained in:
John Ericson 2019-11-22 09:32:34 -05:00 committed by GitHub
commit 60b52e240a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/top-level/all-packages.nix
View File

@ -16519,17 +16519,26 @@ in
linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});
# Derive one of the default .config files # Derive one of the default .config files
linuxConfig = { src, makeTarget ? "defconfig", name ? "kernel.config" }: linuxConfig = {
stdenv.mkDerivation { src,
inherit name src; version ? (builtins.parseDrvName src.name).version,
buildPhase = '' makeTarget ? "defconfig",
set -x name ? "kernel.config",
make ${makeTarget} }: stdenvNoCC.mkDerivation {
''; inherit name src;
installPhase = '' depsBuildBuild = [ buildPackages.stdenv.cc ]
cp .config $out ++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ];
''; buildPhase = ''
}; set -x
make \
ARCH=${stdenv.hostPlatform.kernelArch} \
HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \
${makeTarget}
'';
installPhase = ''
cp .config $out
'';
};
buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs;