3
0
Fork 0
forked from mirrors/nixpkgs

wineUnstable: 2.21 -> 3.0

wineStaging redirects to wineUnstable, for now
This commit is contained in:
Herwig Hochleitner 2018-01-25 23:13:00 +01:00
parent 7a2662569d
commit 4fec62d01d
2 changed files with 8 additions and 7 deletions

View file

@ -56,9 +56,10 @@ let wine-build = build: release:
});
in if wineRelease == "staging" then
callPackage ./staging.nix {
inherit libtxc_dxtn_Name;
wineUnstable = wine-build wineBuild "unstable";
}
let wineUnstable = wine-build wineBuild "unstable"; in
builtins.trace "WARNING: wine staging is not yet at 3.0, using unstable" ( wineUnstable )
# callPackage ./staging.nix {
# inherit libtxc_dxtn_Name wineUnstable;
# }
else
wine-build wineBuild wineRelease

View file

@ -39,9 +39,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "2.21";
url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
sha256 = "1vxbnikdpsmca3nx064mqrm83xpjsfshy25mdfxmyg5vrzl09yms";
version = "3.0";
url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz";
sha256 = "1v7vq9iinkscbq6wg85fb0d2137660fg2nk5iabxkl2wr850asil";
inherit (stable) mono gecko32 gecko64;
};