diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-02-09T12·41+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-02-09T12·41+0000 |
| commit | d0eda1f3e9b2030e373038fd8997f033f2d7aedd (patch) | |
| tree | 9db733f87fceaba36ddcba54b794b8be06c1d136 /src/nix-instantiate | |
| parent | 3854fc9b42d16b810f62b64194b699033b03aaf1 (diff) | |
| parent | 543988572e2abc85767da315b2acc1f971c5d07f (diff) | |
* Merged the SQLite branch.
Diffstat (limited to 'src/nix-instantiate')
| -rw-r--r-- | src/nix-instantiate/Makefile.am | 2 | ||||
| -rw-r--r-- | src/nix-instantiate/nix-instantiate.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nix-instantiate/Makefile.am b/src/nix-instantiate/Makefile.am index a65907a8d40a..b48dbd9d410f 100644 --- a/src/nix-instantiate/Makefile.am +++ b/src/nix-instantiate/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = nix-instantiate nix_instantiate_SOURCES = nix-instantiate.cc help.txt nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la @ADDITIONAL_NETWORK_LIBS@ + ../boost/format/libformat.la nix-instantiate.o: help.txt.hh diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index b330f0cf11f8..3d3b643cfd6e 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -19,7 +19,7 @@ using namespace nix; void printHelp() { - std::cout << string((char *) helpText, sizeof helpText); + std::cout << string((char *) helpText); } |