From fefd3650d4aa0c378da2ae1f1cdda772d5afaf13 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Aug 2014 00:05:17 +0200
Subject: Fix a segfault in ‘nix-env -qa’
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was triggered by 47e185847e729d49e6aa376e8299fd66ef834a0a, which
turned globals.state into a pointer.
---
 src/libexpr/eval.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index aa706cf98359..82c1a43b13d6 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -108,7 +108,7 @@ private:
 
     /* A cache from path names to values. */
 #if HAVE_BOEHMGC
-    typedef std::map<Path, Value, std::less<Path>, gc_allocator<std::pair<const Path, Value> > > FileEvalCache;
+    typedef std::map<Path, Value, std::less<Path>, traceable_allocator<std::pair<const Path, Value> > > FileEvalCache;
 #else
     typedef std::map<Path, Value> FileEvalCache;
 #endif
-- 
cgit 1.4.1