From 57a9ba010a9d00f575fb0191d836c59bc91ab67b Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 4 Nov 2019 16:30:36 +0800 Subject: [PATCH] linuxConfig: avoid buildPackages.callPackage --- pkgs/top-level/all-packages.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ff739167fb..588019e6a66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16310,25 +16310,26 @@ in linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); # Derive one of the default .config files - linuxConfig = let - kernelArch = stdenv.hostPlatform.kernelArch; - in buildPackages.callPackage ({ + linuxConfig = { src, version ? (builtins.parseDrvName src.name).version, makeTarget ? "defconfig", name ? "kernel.config", - lib, stdenv, bison, flex - }: stdenv.mkDerivation { + }: stdenvNoCC.mkDerivation { inherit name src; - nativeBuildInputs = lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ]; + depsBuildBuild = [ buildPackages.stdenv.cc ] + ++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ]; buildPhase = '' set -x - make ${makeTarget} ARCH=${kernelArch} + 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;