From f1080c022a5f93cc8dda25fd31f23665739687bb Mon Sep 17 00:00:00 2001 From: Kane York Date: Sat, 18 Jul 2020 18:52:51 -0700 Subject: [PATCH] fix(3p/nix): convert all holders of EvalState into gc Change-Id: Ia0d1fdd5c73941d02da0ca7152600f966cee5ccb Reviewed-on: https://cl.tvl.fyi/c/depot/+/1280 Tested-by: BuildkiteCI Reviewed-by: tazjin --- third_party/nix/src/libexpr/get-drvs.hh | 2 +- third_party/nix/src/nix-env/nix-env.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/nix/src/libexpr/get-drvs.hh b/third_party/nix/src/libexpr/get-drvs.hh index bb20c32c0..30645123e 100644 --- a/third_party/nix/src/libexpr/get-drvs.hh +++ b/third_party/nix/src/libexpr/get-drvs.hh @@ -7,7 +7,7 @@ namespace nix { -struct DrvInfo { +struct DrvInfo : public gc { public: typedef std::map Outputs; diff --git a/third_party/nix/src/nix-env/nix-env.cc b/third_party/nix/src/nix-env/nix-env.cc index 07bcb54eb..820b8cbca 100644 --- a/third_party/nix/src/nix-env/nix-env.cc +++ b/third_party/nix/src/nix-env/nix-env.cc @@ -48,7 +48,7 @@ struct InstallSourceInfo { Bindings* autoArgs; }; -struct Globals { +struct Globals : public gc { InstallSourceInfo instSource; Path profile; std::shared_ptr state;