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

wineUnstable: 2.21 -> 3.0

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/misc/emulators/wine/default.nix
View File

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

6
pkgs/misc/emulators/wine/sources.nix
View File

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