Merge staging-next into staging

2020-07-30 18:28:15 +02:00
parent 5d6aa8b496 ca63714c0f
commit cee7df4846
180 changed files with 1011 additions and 920 deletions
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -78,6 +78,7 @@ in stdenv.mkDerivation rec {
      --target ${target} \
      -Dhost_arch=${host} \
      -Duse_system_zlib=1 \
+      --enable-libpkix \
      ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \
      ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}