From 4443108073eb07614fe8c9f9796b6c8119835f63 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 30 Sep 2020 01:07:55 -0400 Subject: [PATCH] google-walleye: Pass postPatch as argument rather than override --- devices/google-walleye/kernel/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/devices/google-walleye/kernel/default.nix b/devices/google-walleye/kernel/default.nix index 5f0add65..5a719af4 100644 --- a/devices/google-walleye/kernel/default.nix +++ b/devices/google-walleye/kernel/default.nix @@ -31,9 +31,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 @@ -47,6 +46,9 @@ in done ) ''; +}).overrideAttrs({ postInstall ? "", nativeBuildInputs, ... }: { + installTargets = [ "zinstall" "Image.gz-dtb" "install" ]; + nativeBuildInputs = nativeBuildInputs ++ [ dtc ]; postInstall = postInstall + ''