diff options
| author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2016-10-24 22:03:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-24 22:03:54 -0400 |
| commit | 6dc6147d8f3257935ebfc71aa1faf6b3b305de53 (patch) | |
| tree | e79d26022b07096d8ead89e6df664a4c0aa52242 | |
| parent | b3f7d626c164ae591a067f78bfcbb06fc3a588b9 (diff) | |
| parent | f2fdd1a8131254533232e9560c6e203ce5ac90e6 (diff) | |
| download | nixlib-6dc6147d8f3257935ebfc71aa1faf6b3b305de53.tar nixlib-6dc6147d8f3257935ebfc71aa1faf6b3b305de53.tar.gz nixlib-6dc6147d8f3257935ebfc71aa1faf6b3b305de53.tar.bz2 nixlib-6dc6147d8f3257935ebfc71aa1faf6b3b305de53.tar.lz nixlib-6dc6147d8f3257935ebfc71aa1faf6b3b305de53.tar.xz nixlib-6dc6147d8f3257935ebfc71aa1faf6b3b305de53.tar.zst nixlib-6dc6147d8f3257935ebfc71aa1faf6b3b305de53.zip | |
Merge pull request #19835 from dtzWill/feature/gnutls-parallel-build
gnutls: Build in parallel, cited problems were fixed upstream.
| -rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index f031cb93c985..9425bd7c6a69 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -34,11 +34,7 @@ stdenv.mkDerivation { ] ++ lib.optional guileBindings [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; - # Build of the Guile bindings is not parallel-safe. See - # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad> - # for the actual fix. Also an apparent race in the generation of - # systemkey-args.h. - enableParallelBuilding = false; + enableParallelBuilding = true; buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ] ++ lib.optional doCheck nettools |