From d7537777c3c92ce3430257a947191081237457d8 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 12 Nov 2017 00:13:29 +0100 Subject: [PATCH] files: improve keyword for inheriting executable bit --- modules/files.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/files.nix b/modules/files.nix index 406fdcf30..f2495f5b4 100644 --- a/modules/files.nix +++ b/modules/files.nix @@ -225,7 +225,7 @@ in install -m "$mode" "$source" "$target" else [[ -x $source ]] && isExecutable=1 || isExecutable="" - if [[ $executable == symlink || $isExecutable == $executable ]]; then + if [[ $executable == inherit || $isExecutable == $executable ]]; then ln -s "$source" "$target" else cp "$source" "$target" @@ -242,7 +242,7 @@ in insertFile "${v.source}" \ "${v.target}" \ "${if v.executable == null - then "symlink" + then "inherit" else builtins.toString v.executable}" \ "${builtins.toString v.mode}" \ "${builtins.toString v.recursive}"