From 6944ff05e088c1aa4d5256114136ccefd83ad703 Mon Sep 17 00:00:00 2001 From: bluepython508 <16466646+bluepython508@users.noreply.github.com> Date: Thu, 26 Sep 2024 12:23:27 +0100 Subject: [PATCH] Use portable hostname - macos doesn't have /etc/hostname --- .envrc | 2 +- default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.envrc b/.envrc index 3b2e73e..92ed7b5 100644 --- a/.envrc +++ b/.envrc @@ -1,5 +1,5 @@ use flake -export RELEASE_NODE=frajtano-test@$(cat /etc/hostname) +export RELEASE_NODE=frajtano-test@$(hostname -s) export FRAJTANO_DIR=$PWD/.frajtano_state export FRAJTANO_CONFIG=$PWD/config/config.exs diff --git a/default.nix b/default.nix index 5e1c953..a5765db 100644 --- a/default.nix +++ b/default.nix @@ -41,7 +41,7 @@ file="$FRAJTANO_DIR/cookie" (umask 077; [ -f "$file" ] || ${pkgs.coreutils}/bin/head -c 128 /dev/urandom | ${pkgs.coreutils}/bin/base64 -w0 > "$file") export RELEASE_COOKIE=$(${pkgs.coreutils}/bin/cat "$file") - [ -z $RELEASE_NODE ] && export RELEASE_NODE="frajtano-$(${pkgs.coreutils}/bin/whoami)@$(${pkgs.coreutils}/bin/cat /etc/hostname)" + [ -z $RELEASE_NODE ] && export RELEASE_NODE="frajtano-$(${pkgs.coreutils}/bin/whoami)@$(${pkgs.toybox}/bin/hostname -s)" run() { exec ${lib.getExe pkg} "$@" }