NixOS/mobile-nixos
1
1
Fork 0
mirror of https://github.com/NixOS/mobile-nixos.git synced 2024-12-16 20:21:32 +03:00
Code Issues Projects Releases Wiki Activity

kernel-builder: Add nativeBuildInputs as a parameter

Browse Source 
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.
This commit is contained in:
Samuel Dionne-Riel 2020-09-30 01:05:28 -04:00
parent c360820473
commit 387ce84721
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overlay/mobile-nixos/kernel/builder.nix
View File

@ -56,6 +56,7 @@ in
, patches ? [] , patches ? []
, postPatch ? "" , postPatch ? ""
, makeFlags ? [] , makeFlags ? []
, nativeBuildInputs ? []
# Part of the "API" of the kernel builder. # Part of the "API" of the kernel builder.
# Image builders expect this attribute to know where to find the kernel file. # 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.14") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
++ nativeBuildInputs
; ;
patches = patches =