colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wine: use gcc49 for 64-bit builds

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-12 19:15:45 +03:00
parent 391c3e505e
commit 24835df322
1 changed files with 6 additions and 1 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,4 +1,5 @@
{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, callPackage_i686,
overrideCC, wrapCCMulti, gcc49,
pulseaudioSupport,
wineRelease ? "stable"
}:
@ -16,6 +17,9 @@ in with src; {
wine64 = callPackage ./base.nix {
name = "wine64-${version}";
inherit src version pulseaudioSupport;
# 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 ];
@ -25,7 +29,8 @@ in with src; {
wineWow = callPackage ./base.nix {
name = "wine-wow-${version}";
inherit src version pulseaudioSupport;
stdenv = stdenv_32bit;
# FIXME: see above.
stdenv = overrideCC stdenv_32bit (wrapCCMulti gcc49);
pkgArches = [ pkgs pkgsi686Linux ];
geckos = [ gecko32 gecko64 ];
monos = [ mono ];