aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #543 from ipetkov/fix-device-tree-overlays

Browse source 
raspberry-pi/4/dtmerge: fix application of overlays
This commit is contained in:
Bernardo Meurer 2023-01-23 13:35:16 -05:00 committed by GitHub
parent 7bd6b87b37 320866b985
commit 4cff4f40b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
raspberry-pi/4/apply-overlays-dtmerge.nix
View file

@ -24,15 +24,12 @@ with lib; (base: overlays': stdenvNoCC.mkDerivation {
# skip incompatible and non-matching overlays # skip incompatible and non-matching overlays
if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then
echo "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")" echo "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")"
continue elif ${if ((o.filter or null) == null) then "false" else ''
fi [[ "''${dtb//${o.filter}/}" == "$dtb" ]]
${optionalString ((o.filter or null) != null) ''
if [[ "''${dtb//${o.filter}/}" == "$dtb" ]]; then
echo "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")"
continue
fi
''} ''}
then
echo "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")"
else
echo -n "Applying overlay ${o.name} to $(basename "$dtb")... " echo -n "Applying overlay ${o.name} to $(basename "$dtb")... "
mv "$dtb"{,.in} mv "$dtb"{,.in}
@ -44,6 +41,7 @@ with lib; (base: overlays': stdenvNoCC.mkDerivation {
echo "ok" echo "ok"
rm "$dtb.in" "$dtboWithExt" rm "$dtb.in" "$dtboWithExt"
fi
'')} '')}
done''; done'';