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

Make "nix-env -i wine" work again

Browse Source 
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.
This commit is contained in:
Eelco Dolstra 2015-08-20 19:40:12 +02:00
parent aa3b13549f
commit 60a0bb7f66
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/emulators/wine/packages.nix
View File

@ -27,7 +27,7 @@ let sources = with lib.getAttr wineRelease (import ./versions.nix); {
inherit (sources) version; inherit (sources) version;
in { in {
wine32 = import ./base.nix { wine32 = import ./base.nix {
name = "wine32-${version}"; name = "wine-${version}";
inherit (sources) version src; inherit (sources) version src;
inherit (pkgsi686Linux) lib stdenv; inherit (pkgsi686Linux) lib stdenv;
pkgArches = [ pkgsi686Linux ]; pkgArches = [ pkgsi686Linux ];
@ -46,7 +46,7 @@ in {
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
wineWow = import ./base.nix { wineWow = import ./base.nix {
name = "wineWow-${version}"; name = "wine-wow-${version}";
inherit (sources) version src; inherit (sources) version src;
inherit lib; inherit lib;
stdenv = stdenv_32bit; stdenv = stdenv_32bit;

7
pkgs/top-level/all-packages.nix
View File

@ -15149,14 +15149,13 @@ let
wavegain = callPackage ../applications/audio/wavegain { }; 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 { wine = callPackage ../misc/emulators/wine {
wineRelease = config.wine.release or "stable"; 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"; }; wineStable = wine.override { wineRelease = "stable"; };
wineUnstable = wine.override { wineRelease = "unstable"; }; wineUnstable = lowPrio (wine.override { wineRelease = "unstable"; });
wineStaging = wine.override { wineRelease = "staging"; }; wineStaging = lowPrio (wine.override { wineRelease = "staging"; });
winetricks = callPackage ../misc/emulators/wine/winetricks.nix { winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
inherit (gnome2) zenity; inherit (gnome2) zenity;