diff options
author | Jean-François Roche <jfroche@affinitic.be> | 2022-10-28 12:19:37 +0200 |
---|---|---|
committer | Jean-François Roche <jfroche@affinitic.be> | 2022-10-28 12:19:37 +0200 |
commit | cd86eeb693342c79b01ff38ca723088dc1e42291 (patch) | |
tree | fac4d4ba4ac0631b3a0b578dd9f1e865354e77b3 | |
parent | b154070ab08ccaac673b07fa10138d107859e19e (diff) |
Move savedArgv into libmain
`savedArgv` is not accessible by plugins when defined in main binary.
Moving it into one of the nix lib fix the problem.
-rw-r--r-- | src/libmain/shared.cc | 1 | ||||
-rw-r--r-- | src/nix/main.cc | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index c1cf38565..a58428762 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -33,6 +33,7 @@ namespace nix { +char * * savedArgv; static bool gcWarning = true; diff --git a/src/nix/main.cc b/src/nix/main.cc index d78312944..956730276 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -53,7 +53,6 @@ static bool haveInternet() } std::string programPath; -char * * savedArgv; struct HelpRequested { }; |