From 6bf1232a52f52e57a792379e0b5c7ead3337ce9b Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 8 Jan 2018 03:26:30 +0000 Subject: [PATCH 1/2] wineStaging: rename to wine-staging --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a93350f52f4..7d8798694b4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -163,6 +163,7 @@ mapAliases (rec { vimprobable2Wrapper = vimprobable2; # added 2015-01 virtviewer = virt-viewer; # added 2015-12-24 vorbisTools = vorbis-tools; # added 2016-01-26 + wineStaging = wine-staging; # added 2018-01-08 winusb = woeusb; # added 2017-12-22 x11 = xlibsWrapper; # added 2015-09 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3008f2975ea..7bedd5b7125 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19975,7 +19975,7 @@ with pkgs; wine = winePackages.base; - wineStaging = lowPrio (winePackages.full.override { + wine-staging = lowPrio (winePackages.full.override { wineRelease = "staging"; }); From afaa1adf1aa2373d56140e620b81b63bf3e7ac60 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 8 Jan 2018 03:27:43 +0000 Subject: [PATCH 2/2] wine: build full instead of base Build type should not depend on version being used. It is very confusing that e.g. Morrowind doesn't work on wine but works on wineStaging, and that depends on whether it was built with mpg123 or not. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bedd5b7125..1a6fcf1e18a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19973,7 +19973,7 @@ with pkgs; staging = base.override { wineRelease = "staging"; }; }; - wine = winePackages.base; + wine = winePackages.full; wine-staging = lowPrio (winePackages.full.override { wineRelease = "staging";