From 60a0bb7f66fd51a5b935ed50f8f39a34a5fc55cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Aug 2015 19:40:12 +0200
Subject: [PATCH] Make "nix-env -i wine" work again

Also, make wine32 the default again to prevent a huge closure size
regression. (It recently grew by ~1 GB:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.wineStable.x86_64-linux#tabs-charts)

Issue #8990.
---
 pkgs/misc/emulators/wine/packages.nix | 4 ++--
 pkgs/top-level/all-packages.nix       | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index 4d95dc911dce..ce983b993144 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -27,7 +27,7 @@ let sources = with lib.getAttr wineRelease (import ./versions.nix); {
     inherit (sources) version;
 in {
   wine32 = import ./base.nix {
-    name = "wine32-${version}";
+    name = "wine-${version}";
     inherit (sources) version src;
     inherit (pkgsi686Linux) lib stdenv;
     pkgArches = [ pkgsi686Linux ];
@@ -46,7 +46,7 @@ in {
     platforms = [ "x86_64-linux" ];
   };
   wineWow = import ./base.nix {
-    name = "wineWow-${version}";
+    name = "wine-wow-${version}";
     inherit (sources) version src;
     inherit lib;
     stdenv = stdenv_32bit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6363ec72668b..3853efc66ee1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15149,14 +15149,13 @@ let
 
   wavegain = callPackage ../applications/audio/wavegain { };
 
-  # Wine defaults to a mixed 64 / 32 build on x86_64 and to pure 32 on x86
   wine = callPackage ../misc/emulators/wine {
     wineRelease = config.wine.release or "stable";
-    wineBuild = config.wine.build or (if system == "x86_64-linux" then "wineWow" else "wine32");
+    wineBuild = config.wine.build or "wine32";
   };
   wineStable = wine.override { wineRelease = "stable"; };
-  wineUnstable = wine.override { wineRelease = "unstable"; };
-  wineStaging = wine.override { wineRelease = "staging"; };
+  wineUnstable = lowPrio (wine.override { wineRelease = "unstable"; });
+  wineStaging = lowPrio (wine.override { wineRelease = "staging"; });
 
   winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
     inherit (gnome2) zenity;