ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix building against the latest Nix

Browse Source
This commit is contained in:
Eelco Dolstra 2014-04-08 17:08:09 +02:00
parent d087aeb0d9
commit 4aa01e021e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -10,6 +10,8 @@ AC_PROG_LN_S
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_PROG_CXX AC_PROG_CXX
CXXFLAGS+=" -std=c++0x"
dnl Optional dependencies to build the manual, normally not needed dnl Optional dependencies to build the manual, normally not needed
dnl since the tarball comes with the PDF and HTML manuals. dnl since the tarball comes with the PDF and HTML manuals.
AC_PATH_PROG([DBLATEX], [dblatex]) AC_PATH_PROG([DBLATEX], [dblatex])

2
src/c/hydra-eval-jobs.cc
View File

@ -156,7 +156,7 @@ static void findJobsWrapped(EvalState & state, XMLWriter & doc,
if (a == v.attrs->end()) if (a == v.attrs->end())
throw EvalError("derivation must have a ‘constituents’ attribute"); throw EvalError("derivation must have a ‘constituents’ attribute");
PathSet context; PathSet context;
state.coerceToString(*a->value, context, true, false); state.coerceToString(*a->pos, *a->value, context, true, false);
PathSet drvs; PathSet drvs;
foreach (PathSet::iterator, i, context) foreach (PathSet::iterator, i, context)
if (i->at(0) == '!') { if (i->at(0) == '!') {