Build with large config Boehm GC

(cherry picked from commit 583d06385de82ab5c7fc77d26cd138d3c6d5f4b5)
This commit is contained in:
Eelco Dolstra 2020-02-15 21:48:28 +01:00
parent 91030eae50
commit db3d3a5618
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 12 additions and 4 deletions

View file

@ -50,7 +50,7 @@ rec {
buildDeps =
[ curl
bzip2 xz brotli editline
openssl pkgconfig sqlite boehmgc
openssl pkgconfig sqlite
boost
# Tests
@ -72,6 +72,10 @@ rec {
*/
}));
propagatedDeps =
[ (boehmgc.override { enableLargeConfig = true; })
];
perlDeps =
[ perl
perlPackages.DBDSQLite

View file

@ -23,7 +23,7 @@ let
src = nix;
inherit officialRelease;
buildInputs = tarballDeps ++ buildDeps;
buildInputs = tarballDeps ++ buildDeps ++ propagatedDeps;
configureFlags = "--enable-gc";
@ -67,6 +67,8 @@ let
buildInputs = buildDeps;
propagatedBuildInputs = propagatedDeps;
preConfigure =
# Copy libboost_context so we don't get all of Boost in our closure.
# https://github.com/NixOS/nixpkgs/issues/45462
@ -198,7 +200,9 @@ let
name = "nix-build";
src = tarball;
buildInputs = buildDeps;
enableParallelBuilding = true;
buildInputs = buildDeps ++ propagatedDeps;
dontInstall = false;

View file

@ -7,7 +7,7 @@ with import ./release-common.nix { inherit pkgs; };
(if useClang then clangStdenv else stdenv).mkDerivation {
name = "nix";
buildInputs = buildDeps ++ tarballDeps ++ perlDeps;
buildInputs = buildDeps ++ propagatedDeps ++ tarballDeps ++ perlDeps;
inherit configureFlags;