forked from lix-project/hydra
Use Nix 2.0 and default GCC
This commit is contained in:
parent
3ec73c93e2
commit
cb43da06f3
|
@ -41,7 +41,7 @@ rec {
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
nix = nixUnstable;
|
#nix = nixUnstable;
|
||||||
|
|
||||||
perlDeps = buildEnv {
|
perlDeps = buildEnv {
|
||||||
name = "hydra-perl-deps";
|
name = "hydra-perl-deps";
|
||||||
|
@ -103,8 +103,6 @@ rec {
|
||||||
|
|
||||||
src = if shell then null else hydraSrc;
|
src = if shell then null else hydraSrc;
|
||||||
|
|
||||||
stdenv = overrideCC stdenv gcc6;
|
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
|
[ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
|
||||||
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
|
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
|
||||||
|
|
Loading…
Reference in a new issue