Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv

Conflicts: pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
parent c34932ef86 a2c7804903
commit 811de3bfaa
1015 changed files with 20126 additions and 5810 deletions
@@ -153,7 +153,6 @@ let version = "4.9.1";
          " --disable-libssp --disable-nls" +
          " --without-headers" +
          " --disable-threads " +
-          " --disable-libmudflap " +
          " --disable-libgomp " +
          " --disable-libquadmath" +
          " --disable-shared" +