From 2d8f2503c5bf1ca8478855effdec0879a0050f88 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Mar 2014 11:11:59 +0100
Subject: [PATCH] Build against latest Nix

---
 configure.ac      | 2 +-
 src/c/Makefile.am | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8e90bdd7..68cd4c4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ LDFLAGS="$LDFLAGS -L$nix/lib/nix"
 
 AC_CHECK_HEADER([store-api.hh], [:],
   [AC_MSG_ERROR([Nix headers not found; please install Nix or check the `--with-nix' option.])])
-AC_CHECK_LIB([expr], [_ZN3nix9EvalState8evalFileERKSsRNS_5ValueE], [:],
+AC_CHECK_LIB([nixexpr], [_ZN3nix9EvalState8evalFileERKSsRNS_5ValueE], [:],
   [AC_MSG_ERROR([Nix library not found; please install Nix or check the `--with-nix' option.])])
 
 CPPFLAGS="$old_CPPFLAGS"
diff --git a/src/c/Makefile.am b/src/c/Makefile.am
index fea30f65..f5ea536e 100644
--- a/src/c/Makefile.am
+++ b/src/c/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = hydra-eval-jobs
 
 hydra_eval_jobs_SOURCES = hydra-eval-jobs.cc
-hydra_eval_jobs_LDADD = -lmain -lexpr -L$(nix)/lib/nix $(BDW_GC_LIBS)
+hydra_eval_jobs_LDADD = -lnixmain -lnixexpr -L$(nix)/lib/nix $(BDW_GC_LIBS)
 
 AM_CXXFLAGS =					\
  -I$(nix)/include/nix				\