diff options
Diffstat (limited to 'src/nix-worker')
-rw-r--r-- | src/nix-worker/Makefile.am | 7 | ||||
-rw-r--r-- | src/nix-worker/help.txt | 10 | ||||
-rw-r--r-- | src/nix-worker/nix-worker.cc | 4 |
3 files changed, 2 insertions, 19 deletions
diff --git a/src/nix-worker/Makefile.am b/src/nix-worker/Makefile.am index b6094a2a038c..6b1b2827cbf7 100644 --- a/src/nix-worker/Makefile.am +++ b/src/nix-worker/Makefile.am @@ -1,14 +1,9 @@ bin_PROGRAMS = nix-worker -nix_worker_SOURCES = nix-worker.cc help.txt +nix_worker_SOURCES = nix-worker.cc nix_worker_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ ../boost/format/libformat.la -nix-worker.o: help.txt.hh - -%.txt.hh: %.txt - ../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1) - AM_CXXFLAGS = \ -I$(srcdir)/.. -I$(srcdir)/../libutil \ -I$(srcdir)/../libstore -I$(srcdir)/../libmain diff --git a/src/nix-worker/help.txt b/src/nix-worker/help.txt deleted file mode 100644 index b4583cb7e495..000000000000 --- a/src/nix-worker/help.txt +++ /dev/null @@ -1,10 +0,0 @@ -Usage: nix-worker [OPTIONS...] [--daemon | --slave] - -`nix-worker' is a helper program used to implement secure, multi-user -Nix stores. In `--daemon' mode, it goes into the background and waits -for incoming connections on a Unix domain socket, and forks a process -for each connection to perform the Nix store operations requested by -the caller. In `--slave' mode, `nix-worker' is called directly, and -the caller and the worker communicate with each other over -stdin/stdout. In this mode, the `nix-worker' program should have -appropriate setuid privileges. diff --git a/src/nix-worker/nix-worker.cc b/src/nix-worker/nix-worker.cc index dadde9cc5183..17ffdb616c65 100644 --- a/src/nix-worker/nix-worker.cc +++ b/src/nix-worker/nix-worker.cc @@ -923,11 +923,9 @@ void run(Strings args) } -#include "help.txt.hh" - void printHelp() { - std::cout << string((char *) helpText); + showManPage("nix-worker"); } |