From 4fa1a85aff048ff36a219d4b8bd2d75841469c5b Mon Sep 17 00:00:00 2001
From: Jacob Heider <jacob@pkgx.dev>
Date: Mon, 2 Oct 2023 10:17:26 -0400
Subject: [PATCH] rm tea --prefix

---
 projects/facebook.com/wangle/package.yml               | 2 +-
 projects/github.com/facebookincubator/fizz/package.yml | 2 +-
 projects/python.org/package.yml                        | 2 +-
 projects/tea.xyz/gx/cc/cc.rb                           | 2 +-
 projects/unbound.net/package.yml                       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/projects/facebook.com/wangle/package.yml b/projects/facebook.com/wangle/package.yml
index b012f358..8ae965b3 100644
--- a/projects/facebook.com/wangle/package.yml
+++ b/projects/facebook.com/wangle/package.yml
@@ -37,7 +37,7 @@ build:
     - make
     - cp lib/libwangle.a {{prefix}}/lib
 
-    - sed -i.bak "s:$(tea --prefix):\$\{_IMPORT_PREFIX\}/../../../..:g" "{{prefix}}"/lib/cmake/wangle/wangle-targets.cmake
+    - sed -i.bak "s:$PKGX_DIR:\$\{_IMPORT_PREFIX\}/../../../..:g" "{{prefix}}"/lib/cmake/wangle/wangle-targets.cmake
     - rm "{{prefix}}"/lib/cmake/wangle/wangle-targets.cmake.bak
   env:
     ARGS:
diff --git a/projects/github.com/facebookincubator/fizz/package.yml b/projects/github.com/facebookincubator/fizz/package.yml
index 0f350d28..288bfcf9 100644
--- a/projects/github.com/facebookincubator/fizz/package.yml
+++ b/projects/github.com/facebookincubator/fizz/package.yml
@@ -33,7 +33,7 @@ build:
     cmake --build build
     cmake --install build
 
-    sed -i.bak "s:$(tea --prefix):\$\{_IMPORT_PREFIX\}/../../../..:g" "{{prefix}}"/lib/cmake/fizz/fizz-targets.cmake
+    sed -i.bak "s:$PKGX_DIR:\$\{_IMPORT_PREFIX\}/../../../..:g" "{{prefix}}"/lib/cmake/fizz/fizz-targets.cmake
     rm "{{prefix}}"/lib/cmake/fizz/fizz-targets.cmake.bak
   env:
     ARGS:
diff --git a/projects/python.org/package.yml b/projects/python.org/package.yml
index c7beb0ec..240c6386 100644
--- a/projects/python.org/package.yml
+++ b/projects/python.org/package.yml
@@ -157,7 +157,7 @@ build:
           rm $binfile.bak
         done
 
-        sed -i.bak -e 's|{{ prefix }}|\\$(shell tea --prefix)/python.org/v{{version.major}}|g' $confdir/Makefile
+        sed -i.bak -e 's|{{ prefix }}|\\$(or $(PKGX_DIR),$(HOME)/.pkgx)/python.org/v{{version.major}}|g' $confdir/Makefile
         rm $confdir/Makefile.bak
       working-directory: ${{prefix}}
 
diff --git a/projects/tea.xyz/gx/cc/cc.rb b/projects/tea.xyz/gx/cc/cc.rb
index 1fe31e95..02d9fec8 100755
--- a/projects/tea.xyz/gx/cc/cc.rb
+++ b/projects/tea.xyz/gx/cc/cc.rb
@@ -7,7 +7,7 @@
 # - for tea-envs the user probably won’t use tea.xyz/gx/cc even though they *should*
 #   and thus we set LDFLAGS in the hope that they will be picked up and the rpath set
 
-$pkgx_prefix = ENV['PKGX_DIR'] || `tea --prefix`.chomp
+$pkgx_prefix = ENV['PKGX_DIR'] || ENV['HOME'].chomp
 exe = File.basename($0)
 
 # remove duplicates since this in fact embeds the rpath multiple times
diff --git a/projects/unbound.net/package.yml b/projects/unbound.net/package.yml
index 63acc3ff..0d1c2794 100644
--- a/projects/unbound.net/package.yml
+++ b/projects/unbound.net/package.yml
@@ -20,7 +20,7 @@ build:
     make -j {{ hw.concurrency }} install
 
     cd {{prefix}}/bin
-    sed -i.bak -e "s|$PKGX_DIR/|$(tea --prefix)/|g" unbound-control-setup
+    sed -i.bak -e "s|$PKGX_DIR/|\$PKGX_DIR/|g" unbound-control-setup
     rm unbound-control-setup.bak
   env:
     ARGS: