From b1dd373f5ad3fd3f5e727ff9be72c76c2f7919fa Mon Sep 17 00:00:00 2001 From: Anton Plotnikov Date: Fri, 22 Nov 2019 12:54:29 +0300 Subject: [PATCH] files: update script to support linked Nix store --- modules/files.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/files.nix b/modules/files.nix index ac946976f..11f899639 100644 --- a/modules/files.nix +++ b/modules/files.nix @@ -236,6 +236,9 @@ in ('' mkdir -p $out + # Needed in case /nix is a symbolic link. + realOut="$(realpath -m "$out")" + function insertFile() { local source="$1" local relTarget="$2" @@ -244,10 +247,10 @@ in # Figure out the real absolute path to the target. local target - target="$(realpath -m "$out/$relTarget")" + target="$(realpath -m "$realOut/$relTarget")" # Target path must be within $HOME. - if [[ ! $target == $out* ]] ; then + if [[ ! $target == $realOut* ]] ; then echo "Error installing file '$relTarget' outside \$HOME" >&2 exit 1 fi