diff options
| -rw-r--r-- | release-common.nix | 6 | ||||
| -rw-r--r-- | release.nix | 6 | ||||
| -rw-r--r-- | shell.nix | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/release-common.nix b/release-common.nix index 60c8849d1..eb35d7917 100644 --- a/release-common.nix +++ b/release-common.nix @@ -48,7 +48,7 @@ rec { buildDeps = [ curl bzip2 xz brotli zlib editline - openssl pkgconfig sqlite boehmgc + openssl pkgconfig sqlite libarchive boost nlohmann_json @@ -73,6 +73,10 @@ rec { */ })); + propagatedDeps = + [ (boehmgc.override { enableLargeConfig = true; }) + ]; + perlDeps = [ perl perlPackages.DBDSQLite diff --git a/release.nix b/release.nix index 3dc12cd81..fdf7d0174 100644 --- a/release.nix +++ b/release.nix @@ -67,7 +67,7 @@ let src = nix; inherit officialRelease; - buildInputs = tarballDeps ++ buildDeps; + buildInputs = tarballDeps ++ buildDeps ++ propagatedDeps; postUnpack = '' (cd $sourceRoot && find . -type f) | cut -c3- > $sourceRoot/.dist-files @@ -111,6 +111,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 @@ -244,7 +246,7 @@ let enableParallelBuilding = true; - buildInputs = buildDeps; + buildInputs = buildDeps ++ propagatedDeps; dontInstall = false; @@ -7,7 +7,7 @@ with import ./release-common.nix { inherit pkgs; }; (if useClang then clangStdenv else stdenv).mkDerivation { name = "nix"; - buildInputs = buildDeps ++ tarballDeps ++ perlDeps ++ [ pkgs.rustfmt ]; + buildInputs = buildDeps ++ propagatedDeps ++ tarballDeps ++ perlDeps ++ [ pkgs.rustfmt ]; inherit configureFlags; |