vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

* Fix symbol to look for.

Browse source
This commit is contained in:
Eelco Dolstra 2011-08-19 15:28:32 +00:00
parent 3f8a8c7083
commit 5a8e0d1e13
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -46,7 +46,7 @@ LIBS="-L$nix/lib/nix"
AC_CHECK_HEADER([store-api.hh], [:], AC_CHECK_HEADER([store-api.hh], [:],
[AC_MSG_ERROR([Nix headers not found; please install Nix or check the `--with-nix' option.])]) [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.])]) [AC_MSG_ERROR([Nix library not found; please install Nix or check the `--with-nix' option.])])
CPPFLAGS="$old_CPPFLAGS" CPPFLAGS="$old_CPPFLAGS"

5
release.nix
View file

@ -54,7 +54,7 @@ rec {
configureFlags = "--with-nix=${nix}"; configureFlags = "--with-nix=${nix}";
buildInputs = 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; }; ++ (import ./deps.nix) { inherit pkgs; };
hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [ hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [
@ -75,10 +75,13 @@ rec {
--set NIX_RELEASE ${nix.name} --set NIX_RELEASE ${nix.name}
done done
''; # */ ''; # */
LOGNAME="$USER"; LOGNAME="$USER";
meta = { meta = {
description = "Build of Hydra on ${system}"; description = "Build of Hydra on ${system}";
}; };
succeedOnFailure = true; succeedOnFailure = true;
keepBuildDirectory = true; keepBuildDirectory = true;
}; };