From d4eeecf6b2652ababb6b7b17f1aed4e8c346a743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Dec 2023 09:14:20 +0100 Subject: [PATCH] fix commandline parsing for nix 2.19 --- src/nix-eval-jobs.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nix-eval-jobs.cc b/src/nix-eval-jobs.cc index f1ff278..ec5ff34 100644 --- a/src/nix-eval-jobs.cc +++ b/src/nix-eval-jobs.cc @@ -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 */