From 11a9774c75d4a000b3a987d5176f5da833e39403 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Apr 2015 13:03:04 +0200 Subject: [PATCH] Use "mkdir -p" when creating ~/.nix-defexpr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise, simultaneous invocations of /etc/profile can fail, e.g. mkdir: cannot create directory ‘/.nix-defexpr’: File exists --- nixos/modules/programs/shell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix index 80d40a7c708..d8845fd8f44 100644 --- a/nixos/modules/programs/shell.nix +++ b/nixos/modules/programs/shell.nix @@ -53,7 +53,7 @@ in # Set up a default Nix expression from which to install stuff. if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then rm -f $HOME/.nix-defexpr - mkdir $HOME/.nix-defexpr + mkdir -p $HOME/.nix-defexpr if [ "$USER" != root ]; then ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root fi