Move call-flake.nix into libexpr

corepkgs/local.mk

@@ -1,8 +1,7 @@
 corepkgs_FILES = \
   unpack-channel.nix \
   derivation.nix \
-  fetchurl.nix \
-  call-flake.nix
+  fetchurl.nix
 
 $(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs)))
 

src/libexpr/flake/flake.cc

@@ -623,7 +623,6 @@ void callFlake(EvalState & state,
     const LockedInputs & lockedInputs,
     Value & vRes)
 {
-    auto vCallFlake = state.allocValue();
     auto vLocks = state.allocValue();
     auto vRootSrc = state.allocValue();
     auto vRootSubdir = state.allocValue();
@@ -636,7 +635,15 @@ void callFlake(EvalState & state,
 
     mkString(*vRootSubdir, flake.lockedRef.subdir);
 
-    state.evalFile(canonPath(settings.nixDataDir + "/nix/corepkgs/call-flake.nix", true), *vCallFlake);
+    static Value * vCallFlake = nullptr;
+
+    if (!vCallFlake) {
+        vCallFlake = state.allocValue();
+        state.eval(state.parseExprFromString(
+            #include "call-flake.nix.gen.hh"
+            , "/"), *vCallFlake);
+    }
+
     state.callFunction(*vCallFlake, *vLocks, *vTmp1, noPos);
     state.callFunction(*vTmp1, *vRootSrc, *vTmp2, noPos);
     state.callFunction(*vTmp2, *vRootSubdir, vRes, noPos);

src/libexpr/local.mk

@@ -41,3 +41,5 @@ $(foreach i, $(wildcard src/libexpr/flake/*.hh), \
   $(eval $(call install-file-in, $(i), $(includedir)/nix/flake, 0644)))
 
 $(d)/primops.cc: $(d)/imported-drv-to-derivation.nix.gen.hh
+
+$(d)/flake/flake.cc: $(d)/flake/call-flake.nix.gen.hh

src/libstore/local-store.cc

@@ -343,7 +343,7 @@ void LocalStore::openDB(State & state, bool create)
 
     /* Initialise the database schema, if necessary. */
     if (create) {
-        const char * schema =
+        static const char schema[] =
 #include "schema.sql.gen.hh"
             ;
         db.exec(schema);