diff options
| author | Ram Kromberg <ramkromberg@mail.com> | 2016-08-16 20:35:46 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-08-27 12:27:42 +0300 |
| commit | ee1cc783333d27fa0c7f4c01654e1cd42e3a4dea (patch) | |
| tree | 7baa9f9d79112725cecbea736708349063cd6f90 /pkgs/misc/emulators/wine | |
| parent | 08112088c9ced3100f3d9c615c1f594dfe6a6411 (diff) | |
| download | nixlib-ee1cc783333d27fa0c7f4c01654e1cd42e3a4dea.tar nixlib-ee1cc783333d27fa0c7f4c01654e1cd42e3a4dea.tar.gz nixlib-ee1cc783333d27fa0c7f4c01654e1cd42e3a4dea.tar.bz2 nixlib-ee1cc783333d27fa0c7f4c01654e1cd42e3a4dea.tar.lz nixlib-ee1cc783333d27fa0c7f4c01654e1cd42e3a4dea.tar.xz nixlib-ee1cc783333d27fa0c7f4c01654e1cd42e3a4dea.tar.zst nixlib-ee1cc783333d27fa0c7f4c01654e1cd42e3a4dea.zip | |
Revert "wine: use gcc49 for 64-bit builds"
This reverts commit 24835df32201c22a4d9d8e18042260aefeb78002.
Diffstat (limited to 'pkgs/misc/emulators/wine')
| -rw-r--r-- | pkgs/misc/emulators/wine/packages.nix | 7 |
1 files changed, 1 insertions, 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 ]; |