From f2162a98e76e52864b738dc76c45918a6c55f8f8 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 1 Nov 2024 01:46:24 +0800 Subject: [PATCH 1/7] wrapGAppsHook: append *Phases with appendToVar (cherry picked from commit 9e4756b6869d49b5443aa1c96e9b0e810f3fb7b1) --- .../setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh index 0acf4a8e6f8d4..b2e52f574a524 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh @@ -34,7 +34,7 @@ gappsWrapperArgsHook() { done } -preFixupPhases+=" gappsWrapperArgsHook" +appendToVar preFixupPhases gappsWrapperArgsHook wrapGApp() { local program="$1" From d225514dc7654ce94cd5c659811dc954542b5281 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 1 Nov 2024 01:50:13 +0800 Subject: [PATCH 2/7] gpr-project-darwin-rpath-hook.sh: append *Phases with appendToVar (cherry picked from commit 6f8448a10c9eaa8df0e1e2cc856927bbe65a1c7e) --- .../ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh b/pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh index 73be2eb5960aa..d20895fd12bad 100644 --- a/pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh +++ b/pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh @@ -7,4 +7,4 @@ fixGprProjectDarwinRpath() { done } -preFixupPhases+=" fixGprProjectDarwinRpath" +appendToVar preFixupPhases fixGprProjectDarwinRpath From fb5f40941870492ae64e9ef5f69d6bc94b1cb48c Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 1 Nov 2024 01:51:16 +0800 Subject: [PATCH 3/7] dotnetFixupHook: append *Phases with appendToVar (cherry picked from commit b8d4a65cb17eb3ddec8f742f424a6d195500f281) --- .../dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh index 60e1e327274ac..8d4315350ad5b 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh @@ -97,5 +97,5 @@ dotnetFixupHook() { } if [[ -z "${dontFixup-}" && -z "${dontDotnetFixup-}" ]]; then - preFixupPhases+=" dotnetFixupHook" + appendToVar preFixupPhases dotnetFixupHook fi From 71444745eec52fdc6075279171459ef70ba53726 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 1 Nov 2024 01:53:14 +0800 Subject: [PATCH 4/7] qt5.wrapQtAppsHook: append *Phases with appendToVar (cherry picked from commit 3e7009dee38ccf8d188e5bbcc69df4fd656d5821) --- pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index 94df0a1a8e661..413368268aa20 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -65,7 +65,7 @@ qtOwnPathsHook() { qtHostPathHook "${!outputBin}" } -preFixupPhases+=" qtOwnPathsHook" +appendToVar preFixupPhases qtOwnPathsHook # Note: $qtWrapperArgs still gets defined even if ${dontWrapQtApps-} is set. wrapQtAppsHook() { From 1d4db6241c1727b8e3eb38019a63b7de855b2ffb Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 1 Nov 2024 01:54:04 +0800 Subject: [PATCH 5/7] qt6.wrapQtAppsHook: append *Phases with appendToVar (cherry picked from commit 8bd6a7839902fbd1c875bd1ef4cc09f2e8a48dd7) --- pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh index 2d858055693cc..39b8635e264de 100644 --- a/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh @@ -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() { From 970519e15eccea90b6fc352618d6827f61086325 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 1 Nov 2024 04:18:31 +0800 Subject: [PATCH 6/7] drop-icon-theme-cache.sh: add to *Phases with appendToVar (cherry picked from commit fd54a5636e57a4f498a006ef7a482c2415df14f3) --- pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh b/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh index f28a856c4f50f..0762285843eb4 100644 --- a/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh +++ b/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh @@ -16,4 +16,4 @@ dropIconThemeCache() { fi } -preFixupPhases="${preFixupPhases-} dropIconThemeCache" +appendToVar preFixupPhases dropIconThemeCache From a113f602cc5ecebfb00b59368704298bdc7b7236 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 1 Nov 2024 04:24:12 +0800 Subject: [PATCH 7/7] desktop-file-utils: setup-hook.sh: add to *Phases __structuredAttrs-agnostically (cherry picked from commit 01dc95c6d28b9a9cf0eb8da945d2f36349a5c281) --- pkgs/by-name/de/desktop-file-utils/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/de/desktop-file-utils/setup-hook.sh b/pkgs/by-name/de/desktop-file-utils/setup-hook.sh index 728070e345810..af6b3fab34ee8 100644 --- a/pkgs/by-name/de/desktop-file-utils/setup-hook.sh +++ b/pkgs/by-name/de/desktop-file-utils/setup-hook.sh @@ -3,4 +3,4 @@ mimeinfoPreFixupPhase() { rm -f $out/share/applications/mimeinfo.cache } -preFixupPhases="${preFixupPhases-} mimeinfoPreFixupPhase" +appendToVar preFixupPhases mimeinfoPreFixupPhase