Merge branch 'staging' into fix-ncurses-darwin-extensions

2018-05-02 15:40:38 -05:00
parent b4d9113fbf 3513034208
commit eeb016e8f0
251 changed files with 2068 additions and 1387 deletions
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -73,8 +73,7 @@ let

    makeFlags = [ "MANDIR=$(man)/share/man" ];

-    # Parallel building is broken in OpenSSL.
-    enableParallelBuilding = false;
+    enableParallelBuilding = true;

    postInstall = ''
      # If we're building dynamic libraries, then don't install static