philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Merge pull request #37743 from ikervagyok/wine

Browse source 
wine: Unstable 3.3 -> 3.4 & reenable wineStaging
This commit is contained in:
Jörg Thalheim 2018-03-26 10:10:28 +01:00 committed by GitHub
parent 458ff5a7a0 f8f067d627
commit 90cfaf1ab3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/misc/emulators/wine/default.nix
View file

@ -56,12 +56,9 @@ let wine-build = build: release:
});
in if wineRelease == "staging" then
let wineUnstable = wine-build wineBuild "unstable"; in
# wine staging is not yet at 3.0, using unstable
# FIXME update winestaging sources
wineUnstable
# callPackage ./staging.nix {
# inherit libtxc_dxtn_Name wineUnstable;
# }
callPackage ./staging.nix {
inherit libtxc_dxtn_Name;
wineUnstable = wine-build wineBuild "unstable";
}
else
wine-build wineBuild wineRelease

8
pkgs/misc/emulators/wine/sources.nix
View file

@ -39,18 +39,16 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "3.3";
version = "3.4";
url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
sha256 = "0cx31jsll7mxd9r7v0vpahajqwb6da6cpwybv06l5ydkgfrbv505";
sha256 = "14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
# https://github.com/wine-compholio/wine-staging/releases
inherit (unstable) version;
# FIXME update winestaging sources, when 3.3 is released
# FIXME then revert the staging derivation in ./default.nix
sha256 = "0000000000000000000000000000000000000000000000000000000000000000";
sha256 = "11cdymdd0qf8khhrakzj7qz12gx19h2a30r8bimbx6rriqryhlc2";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";