From 5a8e0d1e1310591a766e6d3121a1419e468fb2f5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Aug 2011 15:28:32 +0000 Subject: [PATCH] * Fix symbol to look for. --- configure.ac | 2 +- release.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index fbe0651d..29a23d68 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ LIBS="-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], [_ZN3nix17parseExprFromFileERNS_9EvalStateESs], [:], +AC_CHECK_LIB([expr], [_ZN3nix9EvalState17parseExprFromFileESs], [:], [AC_MSG_ERROR([Nix library not found; please install Nix or check the `--with-nix' option.])]) CPPFLAGS="$old_CPPFLAGS" diff --git a/release.nix b/release.nix index ef36cb81..85d3c35e 100644 --- a/release.nix +++ b/release.nix @@ -54,7 +54,7 @@ rec { configureFlags = "--with-nix=${nix}"; buildInputs = - [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc sqlite git gitAndTools.topGit mercurial subversion bazaar] + [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc sqlite git gitAndTools.topGit mercurial subversion bazaar ] ++ (import ./deps.nix) { inherit pkgs; }; hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [ @@ -75,10 +75,13 @@ rec { --set NIX_RELEASE ${nix.name} done ''; # */ + LOGNAME="$USER"; + meta = { description = "Build of Hydra on ${system}"; }; + succeedOnFailure = true; keepBuildDirectory = true; };