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
@@ -30,8 +30,8 @@ stdenv.mkDerivation {

  configureFlags = [
    "--enable-threads"
-    "--with-gmp-prefix=${gmp}"
-    "--with-libffi-prefix=${libffi}"
+    "--with-gmp-prefix=${gmp.dev}"
+    "--with-libffi-prefix=${libffi.dev}"
    ]
    ++
    (stdenv.lib.optional (! noUnicode)