max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-12-01 18:16:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://github.com/catern/nix

Browse source
This commit is contained in:
Shea Levy 2018-02-01 13:21:45 -05:00
commit de96daf54f
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/command-ref/env-common.xml
View file

@ -154,6 +154,8 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
<literal>daemon</literal> if you want to use the Nix daemon to <literal>daemon</literal> if you want to use the Nix daemon to
execute Nix operations. This is necessary in <link execute Nix operations. This is necessary in <link
linkend="ssec-multi-user">multi-user Nix installations</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> Otherwise, it should be left unset.</para></listitem>
</varlistentry> </varlistentry>

3
src/libstore/store-api.hh
View file

@ -705,6 +705,9 @@ void removeTempRoots();
* ‘daemon’: The Nix store accessed via a Unix domain socket * ‘daemon’: The Nix store accessed via a Unix domain socket
connection to nix-daemon. 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 * ‘auto’ or ‘’: Equivalent to ‘local’ or ‘daemon’ depending on
whether the user has write access to the local Nix whether the user has write access to the local Nix
store/database. store/database.