b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #19835 from dtzWill/feature/gnutls-parallel-build

Browse source 
gnutls: Build in parallel, cited problems were fixed upstream.
This commit is contained in:
Tim Steinbach 2016-10-24 22:03:54 -04:00 committed by GitHub
parent b3f7d626c1 f2fdd1a813
commit 6dc6147d8f
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/gnutls/generic.nix
View file

@ -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