diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-16 11:27:59 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-16 11:34:21 -0400 |
| commit | 73532c38559b7bad2f6ff31bdef0d283ec75b543 (patch) | |
| tree | 94abebfdd61931c9e0fd1622dd6d16ddbc1f20a8 /modules/config | |
| parent | 8c24de13e4828cfd1c66ae0f3ae0d3c3a39c07fa (diff) | |
| download | nixpkgs-73532c38559b7bad2f6ff31bdef0d283ec75b543.tar nixpkgs-73532c38559b7bad2f6ff31bdef0d283ec75b543.tar.gz nixpkgs-73532c38559b7bad2f6ff31bdef0d283ec75b543.tar.bz2 nixpkgs-73532c38559b7bad2f6ff31bdef0d283ec75b543.tar.lz nixpkgs-73532c38559b7bad2f6ff31bdef0d283ec75b543.tar.xz nixpkgs-73532c38559b7bad2f6ff31bdef0d283ec75b543.tar.zst nixpkgs-73532c38559b7bad2f6ff31bdef0d283ec75b543.zip | |
Global replace /var/run/current-system -> /run/current-system
Diffstat (limited to 'modules/config')
| -rw-r--r-- | modules/config/shells.nix | 1 | ||||
| -rw-r--r-- | modules/config/system-path.nix | 6 | ||||
| -rw-r--r-- | modules/config/users-groups.nix | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/modules/config/shells.nix b/modules/config/shells.nix index 6286223752a..b0a946a8e6e 100644 --- a/modules/config/shells.nix +++ b/modules/config/shells.nix @@ -13,6 +13,7 @@ with pkgs.lib; { target = "shells"; source = pkgs.writeText "shells" '' + /run/current-system/sw/bin/bash /var/run/current-system/sw/bin/bash /bin/sh ''; diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix index 9eab8dde473..38e5f076bcf 100644 --- a/modules/config/system-path.nix +++ b/modules/config/system-path.nix @@ -1,5 +1,5 @@ # This module defines the packages that appear in -# /var/run/current-system/sw. +# /run/current-system/sw. { config, pkgs, ... }: @@ -69,7 +69,7 @@ let example = "[ pkgs.icecat3 pkgs.thunderbird ]"; description = '' The set of packages that appear in - /var/run/current-system/sw. These packages are + /run/current-system/sw. These packages are automatically available to all users, and are automatically updated every time you rebuild the system configuration. (The latter is the main difference with @@ -84,7 +84,7 @@ let default = []; example = ["/"]; description = " - Lists directories to be symlinked in `/var/run/current-system/sw'. + Lists directories to be symlinked in `/run/current-system/sw'. "; }; }; diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix index beb21734652..598d68eb91d 100644 --- a/modules/config/users-groups.nix +++ b/modules/config/users-groups.nix @@ -48,7 +48,7 @@ let shell = mkOption { type = with types; uniq string; - default = "/var/run/current-system/sw/sbin/nologin"; + default = "/run/current-system/sw/sbin/nologin"; description = "The path to the user's shell."; }; |