diff options
Diffstat (limited to 'src/nix-instantiate')
-rw-r--r-- | src/nix-instantiate/Makefile.am | 7 | ||||
-rw-r--r-- | src/nix-instantiate/help.txt | 31 | ||||
-rw-r--r-- | src/nix-instantiate/nix-instantiate.cc | 3 |
3 files changed, 2 insertions, 39 deletions
diff --git a/src/nix-instantiate/Makefile.am b/src/nix-instantiate/Makefile.am index b48dbd9d410f..96978f36c5ae 100644 --- a/src/nix-instantiate/Makefile.am +++ b/src/nix-instantiate/Makefile.am @@ -1,15 +1,10 @@ bin_PROGRAMS = nix-instantiate -nix_instantiate_SOURCES = nix-instantiate.cc help.txt +nix_instantiate_SOURCES = nix-instantiate.cc nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ ../libstore/libstore.la ../libutil/libutil.la \ ../boost/format/libformat.la -nix-instantiate.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)/../libexpr -I$(srcdir)/../libmain -I../libexpr diff --git a/src/nix-instantiate/help.txt b/src/nix-instantiate/help.txt deleted file mode 100644 index 21822132aece..000000000000 --- a/src/nix-instantiate/help.txt +++ /dev/null @@ -1,31 +0,0 @@ -Usage: nix-instantiate [OPTIONS...] [FILES...] - -`nix-instantiate' turns Nix expressions into store derivations. - -The argument `-' may be specified to read a Nix expression from -standard input. - -Options: - - --version: output version information - --help: display help - - --verbose / -v: verbose operation (may be repeated) - - --eval-only: evaluate and print resulting term; do not instantiate - --parse-only: parse and print abstract syntax tree - - --attr / -A PATH: select an attribute from the top-level expression - - --add-root: add garbage collector roots for the result - -For --eval-only / --parse-only: - - --xml: print an XML representation of the abstract syntax tree - --no-location: don't provide source location information in the - output XML tree - -For --eval-only: - - --strict: compute attributes and list elements, rather than being - lazy diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index 34f81b14a286..4d8f43507ca7 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -8,7 +8,6 @@ #include "util.hh" #include "store-api.hh" #include "common-opts.hh" -#include "help.txt.hh" #include <map> #include <iostream> @@ -19,7 +18,7 @@ using namespace nix; void printHelp() { - std::cout << string((char *) helpText); + showManPage("nix-instantiate"); } |