From f2fdd1a8131254533232e9560c6e203ce5ac90e6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 24 Oct 2016 13:22:52 -0500 Subject: gnutls: Build in parallel, cited problems were fixed upstream. The systemkey problem was fixed in 3.4.15 [1]. The guileBindings issue was fixed 3 years ago, and is included in all versions of gnutls we use today [2]. [1] https://gitlab.com/gnutls/gnutls/commit/25d2f643c04bb3315fc045d14204f51f4fc97d01 [2] https://gitlab.com/gnutls/gnutls/commit/0d34b03f0e5e5eac5e04c795cce2655b52b7cfc9 --- pkgs/development/libraries/gnutls/generic.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'pkgs/development/libraries/gnutls') diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index f031cb93c98..9425bd7c6a6 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 - # - # 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 -- cgit 1.4.1