From 72fad2346a5b60a9fe1d72318f69f0d20b0b64d5 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 30 Sep 2020 01:08:02 -0400
Subject: [PATCH] google-marlin: Pass postPatch as argument rather than
 override

---
 devices/google-marlin/kernel/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/devices/google-marlin/kernel/default.nix b/devices/google-marlin/kernel/default.nix
index fe55a885..f6142c49 100644
--- a/devices/google-marlin/kernel/default.nix
+++ b/devices/google-marlin/kernel/default.nix
@@ -30,9 +30,8 @@ in
   ];
 
   isModular = false;
-}).overrideAttrs({ postInstall ? "", postPatch ? "", nativeBuildInputs, ... }: {
-  installTargets = [ "zinstall" "Image.gz-dtb" "install" ];
-  postPatch = postPatch + ''
+
+  postPatch = ''
     # FIXME : factor out
     (
     # Remove -Werror from all makefiles
@@ -49,6 +48,9 @@ in
     # Remove google's default dm-verity certs
     rm -f *.x509
   '';
+}).overrideAttrs({ postInstall ? "", nativeBuildInputs, ... }: {
+  installTargets = [ "zinstall" "Image.gz-dtb" "install" ];
+
   nativeBuildInputs = nativeBuildInputs ++ [ dtc ];
 
   postInstall = postInstall + ''