Merge branch 'master' into staging

Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix

pkgs/misc/emulators/wine/packages.nix

@@ -1,5 +1,4 @@
 { system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686,
-  overrideCC, wrapCCMulti, gcc49,
   wineRelease ? "stable",
   supportFlags
 }:
@@ -17,9 +16,6 @@ in with src; {
   wine64 = callPackage ./base.nix {
     name = "wine64-${version}";
     inherit src version supportFlags;
-    # FIXME: drop this when GCC is updated to >5.3.
-    # Corresponding bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69140
-    stdenv = overrideCC stdenv gcc49;
     pkgArches = [ pkgs ];
     geckos = [ gecko64 ];
     monos =  [ mono ];
@@ -29,8 +25,7 @@ in with src; {
   wineWow = callPackage ./base.nix {
     name = "wine-wow-${version}";
     inherit src version supportFlags;
-    # FIXME: see above.
-    stdenv = overrideCC stdenv_32bit (wrapCCMulti gcc49);
+    stdenv = stdenv_32bit;
     pkgArches = [ pkgs pkgsi686Linux ];
     geckos = [ gecko32 gecko64 ];
     monos =  [ mono ];