aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-François Roche <jfroche@affinitic.be>2022-10-28 12:19:37 +0200
committerJean-François Roche <jfroche@affinitic.be>2022-10-28 12:19:37 +0200
commitcd86eeb693342c79b01ff38ca723088dc1e42291 (patch)
treefac4d4ba4ac0631b3a0b578dd9f1e865354e77b3 /src
parentb154070ab08ccaac673b07fa10138d107859e19e (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.
Diffstat (limited to 'src')
-rw-r--r--src/libmain/shared.cc1
-rw-r--r--src/nix/main.cc1
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 { };