Skip to content

Commit 4775b44

Browse files
committed
fix: still need CURRENT_SYSTEM
1 parent b26114d commit 4775b44

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

flake.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,8 @@
439439
--subst-var-by 'LOCALES' '${localeArchive}' \
440440
--subst-var-by 'EXTENSION_CUSTOM_SCRIPTS_DIR' "$out/extension-custom-scripts" \
441441
--subst-var-by 'MECAB_LIB' '${basePackages.psql_15.exts.pgroonga}/lib/groonga/plugins/tokenizers/tokenizer_mecab.so' \
442-
--subst-var-by 'GROONGA_DIR' '${supabase-groonga}'
442+
--subst-var-by 'GROONGA_DIR' '${supabase-groonga}' \
443+
--subst-var-by 'CURRENT_SYSTEM' '${system}'
443444
444445
chmod +x $out/bin/start-postgres-server
445446
'';

nix/tools/run-server.sh.in

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ EXTENSION_CUSTOM_SCRIPTS=@EXTENSION_CUSTOM_SCRIPTS_DIR@
3232
GROONGA=@GROONGA_DIR@
3333
DATDIR=$(mktemp -d)
3434
LOCALE_ARCHIVE=@LOCALES@
35+
CURRENT_SYSTEM=@CURRENT_SYSTEM@
3536
export LOCALE_ARCHIVE
3637
export LANG=en_US.UTF-8
3738
export LANGUAGE=en_US.UTF-8
@@ -85,10 +86,5 @@ orioledb_config_items() {
8586
fi
8687
}
8788
orioledb_config_items "$1"
88-
if [ "$CURRENT_SYSTEM" = "aarch64-darwin" ]; then
89-
echo "NOTE: using aarch64-darwin system"
90-
sed -i '' 's/ pg_net,//g' "$DATDIR/postgresql.conf"
91-
sed -i '' 's/ pg_net,//g' "$DATDIR/supautils.conf"
92-
fi
9389
export GRN_PLUGINS_DIR=$GROONGA/lib/groonga/plugins
9490
postgres --config-file="$DATDIR/postgresql.conf" -p "$PORTNO" -D "$DATDIR" -k /tmp

0 commit comments

Comments
 (0)