moraxyc/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Build with large config Boehm GC

Browse source
This commit is contained in:
Eelco Dolstra 2020-02-15 21:48:28 +01:00
parent f46bc0e8eb
commit 583d06385d
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
release-common.nix
View file

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

6
release.nix
View file

@ -67,7 +67,7 @@ let
src = nix; src = nix;
inherit officialRelease; inherit officialRelease;
buildInputs = tarballDeps ++ buildDeps; buildInputs = tarballDeps ++ buildDeps ++ propagatedDeps;
postUnpack = '' postUnpack = ''
(cd $sourceRoot && find . -type f) | cut -c3- > $sourceRoot/.dist-files (cd $sourceRoot && find . -type f) | cut -c3- > $sourceRoot/.dist-files
@ -111,6 +111,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
@ -244,7 +246,7 @@ let
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = buildDeps; 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 ++ [ pkgs.rustfmt ]; buildInputs = buildDeps ++ propagatedDeps ++ tarballDeps ++ perlDeps ++ [ pkgs.rustfmt ];
inherit configureFlags; inherit configureFlags;