1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 15:32:43 +01:00

Merge remote-tracking branch 'origin/master' into precise-gc

This commit is contained in:
Eelco Dolstra 2020-02-12 20:41:17 +01:00
commit 488ce10b4e
287 changed files with 11311 additions and 25656 deletions

View file

@ -30,9 +30,7 @@ rec {
});
configureFlags =
[
"--enable-gc"
] ++ lib.optionals stdenv.isLinux [
lib.optionals stdenv.isLinux [
"--with-sandbox-shell=${sh}/bin/busybox"
];
@ -42,16 +40,19 @@ rec {
libxml2
libxslt
docbook5
docbook5_xsl
docbook_xsl_ns
autoconf-archive
autoreconfHook
];
buildDeps =
[ curl
bzip2 xz brotli editline
bzip2 xz brotli zlib editline
openssl pkgconfig sqlite
libarchive
boost
nlohmann_json
rustc cargo
# Tests
git