Merge branch 'staging-next' into staging

2021-01-10 23:24:57 +01:00
parent 5114061fa1 dd72357155
commit 88c998fb21
298 changed files with 746 additions and 415 deletions
--- a/doc/languages-frameworks/emscripten.section.md
+++ b/doc/languages-frameworks/emscripten.section.md
@@ -102,7 +102,7 @@ See the `zlib` example:
        echo "================= /testing zlib using node ================="
      '';

-      postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin ''
+      postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''
        substituteInPlace configure \
          --replace '/usr/bin/libtool' 'ar' \
          --replace 'AR="libtool"' 'AR="ar"' \