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
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ openssl ];
  configureFlags = [
-    "--with-ssl=${openssl}"
+    "--with-ssl=${openssl.dev}"
    "--sysconfdir=/etc"
    "--localstatedir=/var"
  ];