Skip to content

Commit

Permalink
Merge pull request #179619 from Informatic/plymouth-systemd-stage1-th…
Browse files Browse the repository at this point in the history
…emes

nixos/plymouth: fix theme dependency resolution in systemd stage 1
  • Loading branch information
Mic92 authored Aug 11, 2022
2 parents 370e7d9 + 348b885 commit 5a436f5
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions nixos/modules/system/boot/plymouth.nix
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,14 @@ in
mkdir $out
cp -r ${themesEnv}/share/plymouth/themes/${cfg.theme} $out
# Copy more themes if the theme depends on others
for theme in $(grep -hRo '/etc/plymouth/themes/.*$' ${themesEnv} | xargs -n1 basename); do
if [[ -d "${themesEnv}/theme" ]]; then
cp -r "${themesEnv}/theme" $out
for theme in $(grep -hRo '/etc/plymouth/themes/.*$' $out | xargs -n1 basename); do
if [[ -d "${themesEnv}/share/plymouth/themes/$theme" ]]; then
if [[ ! -d "$out/$theme" ]]; then
echo "Adding dependent theme: $theme"
cp -r "${themesEnv}/share/plymouth/themes/$theme" $out
fi
else
echo "Missing theme dependency: $theme"
fi
done
'';
Expand Down

0 comments on commit 5a436f5

Please sign in to comment.