Skip to content

Commit

Permalink
fix wiring of baked-in Nix expressions
Browse files Browse the repository at this point in the history
  • Loading branch information
fricklerhandwerk committed Oct 4, 2023
1 parent c5b4959 commit 73d4b9e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/nix/local.mk
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ src/nix/develop.cc: src/nix/get-env.sh.gen.hh

src/nix-channel/nix-channel.cc: src/nix-channel/unpack-channel.nix.gen.hh

src/nix/main.cc: doc/manual/generate-manpage.nix.gen.hh doc/manual/utils.nix.gen.hh
src/nix/main.cc: doc/manual/generate-manpage.nix.gen.hh doc/manual/utils.nix.gen.hh doc/manual/generate-settings.nix.gen.hh doc/manual/generate-store-info.nix.gen.hh

src/nix/doc/files/%.md: doc/manual/src/command-ref/files/%.md
@mkdir -p $$(dirname $@)
Expand Down
16 changes: 16 additions & 0 deletions src/nix/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,22 @@ static void showHelp(std::vector<std::string> subcommand, NixArgs & toplevel)
, CanonPath::root),
*vUtils);

auto vSettingsInfo = state.allocValue();
state.cacheFile(
CanonPath("/generate-settings.nix"), CanonPath("/generate-settings.nix"),
state.parseExprFromString(
#include "generate-settings.nix.gen.hh"
, CanonPath::root),
*vSettingsInfo);

auto vStoreInfo = state.allocValue();
state.cacheFile(
CanonPath("/generate-store-info.nix"), CanonPath("/generate-store-info.nix"),
state.parseExprFromString(
#include "generate-store-info.nix.gen.hh"
, CanonPath::root),
*vStoreInfo);

auto vDump = state.allocValue();
vDump->mkString(toplevel.dumpCli());

Expand Down

0 comments on commit 73d4b9e

Please sign in to comment.