From 29a10085f313904516992684f1d0fd647fb2ad6d Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 31 Dec 2020 03:31:04 -0500
Subject: [PATCH] kernel-builder: Call either of install or zinstall

It seems that under specific conditions:

 - 2a5 hardware
 - -j22

the call to `make install zinstall` (simplified here) may break, with
the installation of `System.map` happening in a manner where it fails
the build. It was not trivial to reproduce elsewhere than on a 2a5
machine, for unknown reasons.

It was also only observed on google-walleye, but there is no reason is
shouldn't be failing on other devices too.

Odd.
---
 overlay/mobile-nixos/kernel/builder.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/overlay/mobile-nixos/kernel/builder.nix b/overlay/mobile-nixos/kernel/builder.nix
index cb32ee2c1..da5043439 100644
--- a/overlay/mobile-nixos/kernel/builder.nix
+++ b/overlay/mobile-nixos/kernel/builder.nix
@@ -337,10 +337,8 @@ stdenv.mkDerivation (inputArgs // {
   # no-op buildPhase if we combine build and install steps
   buildPhase = if enableCombiningBuildAndInstallQuirk then ":" else null;
 
-  installTargets = [
-    "install"
-  ]
-    ++ optional (isCompressed != false) "zinstall"
+  installTargets =
+    if isCompressed != false then [ "zinstall" ] else [ "install" ]
     ++ installTargets
   ;