From 387ce84721dea95b720e7e1bb2c7255717787f1a Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 30 Sep 2020 01:05:28 -0400 Subject: [PATCH] kernel-builder: Add nativeBuildInputs as a parameter This is a temporary measure. The last changes have proven that we can't just overrideAttrs things willy-nilly like that, and that the whole builder is in need of a revamp. Let's wait for the revamp, and do the minimum work required to fix the normalization for existing builds. --- overlay/mobile-nixos/kernel/builder.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/overlay/mobile-nixos/kernel/builder.nix b/overlay/mobile-nixos/kernel/builder.nix index 3e0ab4da..a6d4ccb4 100644 --- a/overlay/mobile-nixos/kernel/builder.nix +++ b/overlay/mobile-nixos/kernel/builder.nix @@ -56,6 +56,7 @@ in , patches ? [] , postPatch ? "" , makeFlags ? [] +, nativeBuildInputs ? [] # Part of the "API" of the kernel builder. # Image builders expect this attribute to know where to find the kernel file. @@ -115,6 +116,7 @@ let kernel = stdenv.mkDerivation { ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] + ++ nativeBuildInputs ; patches =