diff options
| author | Will Dietz <w@wdtz.org> | 2016-10-24 13:22:52 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2016-10-24 13:49:11 -0500 |
| commit | f2fdd1a8131254533232e9560c6e203ce5ac90e6 (patch) | |
| tree | 5e519a96ce546d034afeffee1af804fd138400cc /pkgs/development/libraries/gnutls | |
| parent | ffca975de7cbb1eeb9a75261479cbfa2c54ccead (diff) | |
| download | nixpkgs-f2fdd1a8131254533232e9560c6e203ce5ac90e6.tar nixpkgs-f2fdd1a8131254533232e9560c6e203ce5ac90e6.tar.gz nixpkgs-f2fdd1a8131254533232e9560c6e203ce5ac90e6.tar.bz2 nixpkgs-f2fdd1a8131254533232e9560c6e203ce5ac90e6.tar.lz nixpkgs-f2fdd1a8131254533232e9560c6e203ce5ac90e6.tar.xz nixpkgs-f2fdd1a8131254533232e9560c6e203ce5ac90e6.tar.zst nixpkgs-f2fdd1a8131254533232e9560c6e203ce5ac90e6.zip | |
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
Diffstat (limited to 'pkgs/development/libraries/gnutls')
| -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 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 - # <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 |