Merge master into staging-next

2021-05-21 12:28:43 +00:00
parent acb7a605e2 c455f3ccaf
commit 929b12e7b5
28 changed files with 409 additions and 445 deletions
@@ -5,7 +5,7 @@
 , asciidoctor, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xsl_ns, docbook_xml_dtd_45
 , libxslt, tcl, tk, makeWrapper, libiconv
 , svnSupport, subversionClient, perlLibs, smtpPerlLibs
-, perlSupport ? true
+, perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform
 , nlsSupport ? true
 , osxkeychainSupport ? stdenv.isDarwin
 , guiSupport