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

2016-07-21 00:56:43 +00:00
parent cc540843fe db7b4fb073
commit 1f04b4a566
226 changed files with 6549 additions and 1215 deletions
@@ -23,6 +23,7 @@ stdenv.mkDerivation {
  configureFlags = [
    "--with-ssl-include-dir=${openssl.dev}/include/openssl"
    "--with-tcl-lib=${tcl.libPrefix}"
+    "--with-passfile=.pine-passfile"
  ];

  preConfigure = ''