From 75e0aa0abe3f18ee20e8b3560b3f0c1b2bb380e3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 15 Feb 2020 21:48:28 +0100 Subject: [PATCH] Build with large config Boehm GC (cherry picked from commit 583d06385de82ab5c7fc77d26cd138d3c6d5f4b5) (cherry picked from commit db3d3a56184a34d7fa46f493e1ecd3ff0ff10453) --- release-common.nix | 6 +++++- release.nix | 6 ++++-- shell.nix | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/release-common.nix b/release-common.nix index 655da3b2707..6f0208ac982 100644 --- a/release-common.nix +++ b/release-common.nix @@ -71,7 +71,7 @@ rec { buildDeps = [ curl bzip2 xz brotli editline - openssl pkgconfig sqlite boehmgc + openssl pkgconfig sqlite boost nlohmann_json @@ -88,6 +88,10 @@ rec { inherit stdenv curl; }); + propagatedDeps = + [ (boehmgc.override { enableLargeConfig = true; }) + ]; + perlDeps = [ perl perlPackages.DBDSQLite diff --git a/release.nix b/release.nix index a388cbe45f2..cec38947e45 100644 --- a/release.nix +++ b/release.nix @@ -23,7 +23,7 @@ let src = nix; inherit officialRelease; - buildInputs = tarballDeps ++ buildDeps; + buildInputs = tarballDeps ++ buildDeps ++ propagatedDeps; postUnpack = '' (cd $sourceRoot && find . -type f) | cut -c3- > $sourceRoot/.dist-files @@ -65,6 +65,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 @@ -197,7 +199,7 @@ let enableParallelBuilding = true; - buildInputs = buildDeps; + buildInputs = buildDeps ++ propagatedDeps; dontInstall = false; diff --git a/shell.nix b/shell.nix index 3583fd6a878..a575e83d93b 100644 --- a/shell.nix +++ b/shell.nix @@ -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;