From 144bb3ef7ddca6502ea3e1878f7fc0a3f9013aba 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 --- flake.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index fc0252859..ff9f817c0 100644 --- a/flake.nix +++ b/flake.nix @@ -69,7 +69,7 @@ buildDeps = [ curl bzip2 xz brotli zlib editline - openssl pkgconfig sqlite boehmgc + openssl pkgconfig sqlite libarchive boost (nlohmann_json.override { multipleHeaders = true; }) @@ -88,6 +88,10 @@ customMemoryManagement = false; }); + propagatedDeps = + [ (boehmgc.override { enableLargeConfig = true; }) + ]; + perlDeps = [ perl perlPackages.DBDSQLite @@ -108,6 +112,8 @@ 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 @@ -219,7 +225,7 @@ src = self; inherit officialRelease; - buildInputs = tarballDeps ++ buildDeps; + buildInputs = tarballDeps ++ buildDeps ++ propagatedDeps; postUnpack = '' (cd $sourceRoot && find . -type f) | cut -c3- > $sourceRoot/.dist-files @@ -358,7 +364,7 @@ enableParallelBuilding = true; - buildInputs = buildDeps; + buildInputs = buildDeps ++ propagatedDeps; dontInstall = false; @@ -503,7 +509,7 @@ stdenv.mkDerivation { name = "nix"; - buildInputs = buildDeps ++ tarballDeps ++ perlDeps ++ [ pkgs.rustfmt ]; + buildInputs = buildDeps ++ propagatedDeps ++ tarballDeps ++ perlDeps ++ [ pkgs.rustfmt ]; inherit configureFlags;