diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-12 19:15:45 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-12 20:55:28 +0300 |
| commit | 24835df32201c22a4d9d8e18042260aefeb78002 (patch) | |
| tree | 9ce82328a0d670b40bd8bb42eb9c7e5a829a921e | |
| parent | 391c3e505e08d4b12f0f06ca2d59c5552d37a373 (diff) | |
| download | nixlib-24835df32201c22a4d9d8e18042260aefeb78002.tar nixlib-24835df32201c22a4d9d8e18042260aefeb78002.tar.gz nixlib-24835df32201c22a4d9d8e18042260aefeb78002.tar.bz2 nixlib-24835df32201c22a4d9d8e18042260aefeb78002.tar.lz nixlib-24835df32201c22a4d9d8e18042260aefeb78002.tar.xz nixlib-24835df32201c22a4d9d8e18042260aefeb78002.tar.zst nixlib-24835df32201c22a4d9d8e18042260aefeb78002.zip | |
wine: use gcc49 for 64-bit builds
| -rw-r--r-- | pkgs/misc/emulators/wine/packages.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix index 45c48182f284..206deb01b8bb 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/misc/emulators/wine/packages.nix @@ -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 ]; |