puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

fix wiring of baked-in Nix expressions

Browse source
This commit is contained in:
Valentin Gagarin 2023-10-04 23:07:13 +02:00
parent 64b73476ce
commit 8232711c9f
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nix/local.mk
View file

@ -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-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 src/nix/doc/files/%.md: doc/manual/src/command-ref/files/%.md
@mkdir -p $$(dirname $@) @mkdir -p $$(dirname $@)

16
src/nix/main.cc
View file

@ -214,6 +214,22 @@ static void showHelp(std::vector<std::string> subcommand, NixArgs & toplevel)
, CanonPath::root), , CanonPath::root),
*vUtils); *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(); auto vDump = state.allocValue();
vDump->mkString(toplevel.dumpCli()); vDump->mkString(toplevel.dumpCli());