Merge pull request #179619 from Informatic/plymouth-systemd-stage1-themes

nixos/plymouth: fix theme dependency resolution in systemd stage 1
This commit is contained in:
Jörg Thalheim 2022-08-11 08:38:33 +01:00 committed by GitHub
commit 5a436f538f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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
'';