From cd86eeb693342c79b01ff38ca723088dc1e42291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= <jfroche@affinitic.be>
Date: Fri, 28 Oct 2022 12:19:37 +0200
Subject: 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.
---
 src/libmain/shared.cc | 1 +
 src/nix/main.cc       | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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 { };
 
-- 
cgit v1.2.3