Author: eelco
Date: Fri Aug 19 15:28:32 2011
New Revision: 28692
URL: https://svn.nixos.org/websvn/nix/?rev=28692&sc=1
Log:
* Fix symbol to look for.
Modified:
hydra/trunk/configure.ac
hydra/trunk/release.nix
Modified: hydra/trunk/configure.ac
==============================================================================
--- hydra/trunk/configure.ac Fri Aug 19 15:14:01 2011 (r28691)
+++ hydra/trunk/configure.ac Fri Aug 19 15:28:32 2011 (r28692)
@@ -46,7 +46,7 @@
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"
Modified: hydra/trunk/release.nix
==============================================================================
--- hydra/trunk/release.nix Fri Aug 19 15:14:01 2011 (r28691)
+++ hydra/trunk/release.nix Fri Aug 19 15:28:32 2011 (r28692)
@@ -54,7 +54,7 @@
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 @@
--set NIX_RELEASE ${nix.name}
done
''; # */
+
LOGNAME="$USER";
+
meta = {
description = "Build of Hydra on ${system}";
};
+
succeedOnFailure = true;
keepBuildDirectory = true;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
