From 7ea3ea836454f2ecaaa38d98f3363f6a9a81e65c Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Sun, 9 Mar 2025 13:40:11 +0100 Subject: [PATCH] Use coreutils-full/bin as PATH in Bookwyrm install script --- packages/bookwyrm/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/bookwyrm/package.nix b/packages/bookwyrm/package.nix index 47e00c5..69e1a27 100644 --- a/packages/bookwyrm/package.nix +++ b/packages/bookwyrm/package.nix @@ -144,7 +144,9 @@ mkDerivation { cat <<- EOF > $out/bin/bookwyrm-env #!${bash}/bin/sh - if [ \$( ${coreutils-full}/bin/id -un ) != "bookwyrm" -o \$( ${coreutils-full}/bin/id -gn ) != "bookwyrm" ] ; then + PATH=${coreutils-full}/bin + + if [ \$( id -un ) != "bookwyrm" -o \$( id -gn ) != "bookwyrm" ] ; then echo "You are not running as the 'bookwyrm' user and group, quitting" exit 1 fi @@ -160,7 +162,7 @@ mkDerivation { export EMAIL_HOST_PASSWORD="" # The escape here is required in order to retrieve the key file contents at runtime - export SECRET_KEY="\$( ${coreutils-full}/bin/cat /etc/nixos/assets/bookwyrm-secret-key )" + export SECRET_KEY="\$( cat /etc/nixos/assets/bookwyrm-secret-key )" exec \$@ EOF