pyrox.dev
Revert "wine: use gcc49 for 64-bit builds"
This reverts commit 24835df32201c22a4d9d8e18042260aefeb78002.
authored by Ram Kromberg and committed by Nikolay Amiantov ee1cc783 08112088
+1
-6
pkgs/misc/emulators/wine/packages.nix
+1
-6
pkgs/misc/emulators/wine/packages.nix
···
1
1
{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686,
2
-
overrideCC, wrapCCMulti, gcc49,
3
2
wineRelease ? "stable",
4
3
supportFlags
5
4
}:
···
17
16
wine64 = callPackage ./base.nix {
18
17
name = "wine64-${version}";
19
18
inherit src version supportFlags;
20
-
# FIXME: drop this when GCC is updated to >5.3.
21
-
# Corresponding bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69140
22
-
stdenv = overrideCC stdenv gcc49;
23
19
pkgArches = [ pkgs ];
24
20
geckos = [ gecko64 ];
25
21
monos = [ mono ];
···
29
25
wineWow = callPackage ./base.nix {
30
26
name = "wine-wow-${version}";
31
27
inherit src version supportFlags;
32
-
# FIXME: see above.
33
-
stdenv = overrideCC stdenv_32bit (wrapCCMulti gcc49);
28
+
stdenv = stdenv_32bit;
34
29
pkgArches = [ pkgs pkgsi686Linux ];
35
30
geckos = [ gecko32 gecko64 ];
36
31
monos = [ mono ];