MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "wine: use gcc49 for 64-bit builds"

Browse source 
This reverts commit 24835df322.
This commit is contained in:
Ram Kromberg 2016-08-16 20:35:46 +03:00 committed by Nikolay Amiantov
parent 08112088c9
commit ee1cc78333
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/misc/emulators/wine/packages.nix
View file

@ -1,5 +1,4 @@
{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686, { system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686,
overrideCC, wrapCCMulti, gcc49,
wineRelease ? "stable", wineRelease ? "stable",
supportFlags supportFlags
}: }:
@ -17,9 +16,6 @@ in with src; {
wine64 = callPackage ./base.nix { wine64 = callPackage ./base.nix {
name = "wine64-${version}"; name = "wine64-${version}";
inherit src version supportFlags; 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 ]; pkgArches = [ pkgs ];
geckos = [ gecko64 ]; geckos = [ gecko64 ];
monos = [ mono ]; monos = [ mono ];
@ -29,8 +25,7 @@ in with src; {
wineWow = callPackage ./base.nix { wineWow = callPackage ./base.nix {
name = "wine-wow-${version}"; name = "wine-wow-${version}";
inherit src version supportFlags; inherit src version supportFlags;
# FIXME: see above. stdenv = stdenv_32bit;
stdenv = overrideCC stdenv_32bit (wrapCCMulti gcc49);
pkgArches = [ pkgs pkgsi686Linux ]; pkgArches = [ pkgs pkgsi686Linux ];
geckos = [ gecko32 gecko64 ]; geckos = [ gecko32 gecko64 ];
monos = [ mono ]; monos = [ mono ];