From ee1cc783333d27fa0c7f4c01654e1cd42e3a4dea Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Tue, 16 Aug 2016 20:35:46 +0300
Subject: [PATCH] Revert "wine: use gcc49 for 64-bit builds"

This reverts commit 24835df32201c22a4d9d8e18042260aefeb78002.
---
 pkgs/misc/emulators/wine/packages.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index 6c06bcb0949b..a786babc79de 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/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 ];