Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: handle *Phases variables __structuredAttrs-agnostically (round 2) #352709

Merged
merged 7 commits into from
Dec 16, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,5 @@ dotnetFixupHook() {
}

if [[ -z "${dontFixup-}" && -z "${dontDotnetFixup-}" ]]; then
preFixupPhases+=" dotnetFixupHook"
appendToVar preFixupPhases dotnetFixupHook
fi
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ gappsWrapperArgsHook() {
done
}

preFixupPhases+=" gappsWrapperArgsHook"
appendToVar preFixupPhases gappsWrapperArgsHook

wrapGApp() {
local program="$1"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/by-name/de/desktop-file-utils/setup-hook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ mimeinfoPreFixupPhase() {
rm -f $out/share/applications/mimeinfo.cache
}

preFixupPhases="${preFixupPhases-} mimeinfoPreFixupPhase"
appendToVar preFixupPhases mimeinfoPreFixupPhase
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ fixGprProjectDarwinRpath() {
done
}

preFixupPhases+=" fixGprProjectDarwinRpath"
appendToVar preFixupPhases fixGprProjectDarwinRpath
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ dropIconThemeCache() {
fi
}

preFixupPhases="${preFixupPhases-} dropIconThemeCache"
appendToVar preFixupPhases dropIconThemeCache
2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ qtOwnPathsHook() {
qtHostPathHook "${!outputBin}"
}

preFixupPhases+=" qtOwnPathsHook"
appendToVar preFixupPhases qtOwnPathsHook

# Note: $qtWrapperArgs still gets defined even if ${dontWrapQtApps-} is set.
wrapQtAppsHook() {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then
qtHostPathHook "${!outputBin}"
}

preFixupPhases+=" qtOwnPathsHook"
appendToVar preFixupPhases qtOwnPathsHook

# Note: $qtWrapperArgs still gets defined even if ${dontWrapQtApps-} is set.
wrapQtAppsHook() {
Expand Down
Loading