nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-25 16:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build with large config Boehm GC

Browse Source 
(cherry picked from commit 583d06385d)
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release-common.nix
View File

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

8
release.nix
View File

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

2
shell.nix
View File

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