fix commandline parsing for nix 2.19

This commit is contained in:
Jörg Thalheim 2023-12-06 09:14:20 +01:00 committed by mergify[bot]
parent c240e61481
commit d4eeecf6b2

View file

@ -43,7 +43,7 @@ using namespace nlohmann;
#elif __clang__
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#endif
struct MyArgs : MixEvalArgs, MixCommonArgs {
struct MyArgs : virtual MixEvalArgs, virtual MixCommonArgs, virtual RootArgs {
std::string releaseExpr;
Path gcRootsDir;
bool flake = false;
@ -545,7 +545,7 @@ int main(int argc, char **argv) {
initNix();
initGC();
myArgs.parseCmdline(argvToStrings(argc, argv));
myArgs.parseCmdline(argvToStrings(argc, argv), 0);
/* FIXME: The build hook in conjunction with import-from-derivation is
* causing "unexpected EOF" during eval */