diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-01 13:21:45 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-01 13:21:45 -0500 |
| commit | de96daf54f3143753073314e0c0e23851c568633 (patch) | |
| tree | 9f62c0ba01167cc307c3f8f79584c67f37d3d40f | |
| parent | 19477e8815a7c9b91c82278ec0e22957c97bec16 (diff) | |
| parent | e5432574e2d54388eb52292da540f2d4de07e9dc (diff) | |
Merge branch 'master' of git://github.com/catern/nix
| -rw-r--r-- | doc/manual/command-ref/env-common.xml | 2 | ||||
| -rw-r--r-- | src/libstore/store-api.hh | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/manual/command-ref/env-common.xml b/doc/manual/command-ref/env-common.xml index a83aeaf2e..361d3e2b0 100644 --- a/doc/manual/command-ref/env-common.xml +++ b/doc/manual/command-ref/env-common.xml @@ -154,6 +154,8 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen> <literal>daemon</literal> if you want to use the Nix daemon to execute Nix operations. This is necessary in <link linkend="ssec-multi-user">multi-user Nix installations</link>. + If the Nix daemon's Unix socket is at some non-standard path, + this variable should be set to <literal>unix://path/to/socket</literal>. Otherwise, it should be left unset.</para></listitem> </varlistentry> diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index c0e735cd3..b21d3dd8a 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -705,6 +705,9 @@ void removeTempRoots(); * ‘daemon’: The Nix store accessed via a Unix domain socket connection to nix-daemon. + * ‘unix://<path>’: The Nix store accessed via a Unix domain socket + connection to nix-daemon, with the socket located at <path>. + * ‘auto’ or ‘’: Equivalent to ‘local’ or ‘daemon’ depending on whether the user has write access to the local Nix store/database. |