From d517a7ad8a10743c8578942a71d1b5bddf8a4351 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 22 Jan 2024 12:13:46 -0700 Subject: [PATCH] Inject own runtimePath to brew.sh --- modules/brew.tail.sh | 2 +- modules/default.nix | 1 + scripts/update-brew-tail.sh | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/brew.tail.sh b/modules/brew.tail.sh index 7508979..b5e0631 100644 --- a/modules/brew.tail.sh +++ b/modules/brew.tail.sh @@ -127,7 +127,7 @@ then fi # filter the user environment -PATH="/usr/bin:/bin:/usr/sbin:/sbin" +PATH="@runtimePath@:/usr/bin:/bin:/usr/sbin:/sbin" FILTERED_ENV=() ENV_VAR_NAMES=( diff --git a/modules/default.nix b/modules/default.nix index c431811..ab8f1d6 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -134,6 +134,7 @@ let src = template; isExecutable = true; + inherit runtimePath; inherit (prefix) prefix library; }; diff --git a/scripts/update-brew-tail.sh b/scripts/update-brew-tail.sh index b992c54..2dd79cd 100755 --- a/scripts/update-brew-tail.sh +++ b/scripts/update-brew-tail.sh @@ -22,4 +22,7 @@ cat >"${brew_tail}" <>"${brew_tail}" +sed \ + -e '1,/^HOMEBREW_LIBRARY=/d' \ + -e 's/^PATH="/PATH="@runtimePath@:/' \ + "${brew_upstream}" >>"${brew_tail}"