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

  hardeningDisable = [ "format" ];

-  configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"
+  configureFlags = "--with-ssl=${openssl.dev} --with-gc=${boehmgc.dev}"
    + optionalString graphicsSupport " --enable-image=${optionalString x11Support "x11,"}fb";

  preConfigure = ''