diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-01 18:42:06 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-03 10:11:09 +0200 |
commit | c698ec1f220f9be4c4184532f0a6c2a9370f3839 (patch) | |
tree | 0f342df53ff7d87784be74c76def8ddd914c6f9a | |
parent | b6b142b4b10552f2a2a8c904487bbd196d35a5c1 (diff) |
nix-shell: Fix 'nix-shell -i'
The 'args' variable here is shadowing one in the outer scope and its
contents end up unused. This causes any '#! nix-shell' lines to
effectively be ignored. The intention here was to clear the args vector,
as far as I can tell (and it seems to work).
-rwxr-xr-x | src/nix-build/nix-build.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc index 08c679357..4d86f394b 100755 --- a/src/nix-build/nix-build.cc +++ b/src/nix-build/nix-build.cc @@ -117,7 +117,7 @@ int main(int argc, char ** argv) inShebang = true; for (int i = 2; i < argc - 1; ++i) savedArgs.push_back(argv[i]); - std::vector<string> args; + args.clear(); for (auto line : lines) { line = chomp(line); std::smatch match; |