Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-05-30 19:39:34 +00:00
parent 365379857f 2661511cdb
commit 2d382f3d98
711 changed files with 49079 additions and 11672 deletions
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
  hardeningDisable = [ "format" "fortify" ];

  configureFlags = [
-    "--with-ssl-include-dir=${openssl}/include/openssl"
+    "--with-ssl-include-dir=${openssl.dev}/include/openssl"
    "--with-tcl-lib=${tcl.libPrefix}"
  ];