diff options
| -rw-r--r-- | release-common.nix | 6 | ||||
| -rw-r--r-- | release.nix | 8 | ||||
| -rw-r--r-- | shell.nix | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/release-common.nix b/release-common.nix index 2e8a951b9cd2..d66bbafa8e10 100644 --- a/release-common.nix +++ b/release-common.nix @@ -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 diff --git a/release.nix b/release.nix index 2ab6a63f7aef..64aa1a976689 100644 --- a/release.nix +++ b/release.nix @@ -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; diff --git a/shell.nix b/shell.nix index 8167f87a2929..e8026f8e40b1 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; |