diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-04-20 13:03:04 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-04-20 13:03:04 +0200 |
| commit | 11a9774c75d4a000b3a987d5176f5da833e39403 (patch) | |
| tree | 8b363bbbeebb0b4775e43498ec5ffdd1164d908b /nixos | |
| parent | d69b205527f36ede1b88d3bc42dbada9ecd8d3a5 (diff) | |
| download | nixpkgs-11a9774c75d4a000b3a987d5176f5da833e39403.tar nixpkgs-11a9774c75d4a000b3a987d5176f5da833e39403.tar.gz nixpkgs-11a9774c75d4a000b3a987d5176f5da833e39403.tar.bz2 nixpkgs-11a9774c75d4a000b3a987d5176f5da833e39403.tar.lz nixpkgs-11a9774c75d4a000b3a987d5176f5da833e39403.tar.xz nixpkgs-11a9774c75d4a000b3a987d5176f5da833e39403.tar.zst nixpkgs-11a9774c75d4a000b3a987d5176f5da833e39403.zip | |
Use "mkdir -p" when creating ~/.nix-defexpr
Otherwise, simultaneous invocations of /etc/profile can fail, e.g. mkdir: cannot create directory ‘/.nix-defexpr’: File exists
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/programs/shell.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 |