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

google-marlin: Pass postPatch as argument rather than override

Browse Source
This commit is contained in:
Samuel Dionne-Riel 2020-09-30 01:08:02 -04:00
parent 4443108073
commit 72fad2346a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devices/google-marlin/kernel/default.nix
View File

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