mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 17:39:34 +00:00
Merge pull request #37743 from ikervagyok/wine
wine: Unstable 3.3 -> 3.4 & reenable wineStaging
This commit is contained in:
commit
90cfaf1ab3
pkgs/misc/emulators/wine
|
@ -56,12 +56,9 @@ let wine-build = build: release:
|
||||||
});
|
});
|
||||||
|
|
||||||
in if wineRelease == "staging" then
|
in if wineRelease == "staging" then
|
||||||
let wineUnstable = wine-build wineBuild "unstable"; in
|
callPackage ./staging.nix {
|
||||||
# wine staging is not yet at 3.0, using unstable
|
inherit libtxc_dxtn_Name;
|
||||||
# FIXME update winestaging sources
|
wineUnstable = wine-build wineBuild "unstable";
|
||||||
wineUnstable
|
}
|
||||||
# callPackage ./staging.nix {
|
|
||||||
# inherit libtxc_dxtn_Name wineUnstable;
|
|
||||||
# }
|
|
||||||
else
|
else
|
||||||
wine-build wineBuild wineRelease
|
wine-build wineBuild wineRelease
|
||||||
|
|
|
@ -39,18 +39,16 @@ 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 = "3.3";
|
version = "3.4";
|
||||||
url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
|
url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
|
||||||
sha256 = "0cx31jsll7mxd9r7v0vpahajqwb6da6cpwybv06l5ydkgfrbv505";
|
sha256 = "14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4";
|
||||||
inherit (stable) mono gecko32 gecko64;
|
inherit (stable) mono gecko32 gecko64;
|
||||||
};
|
};
|
||||||
|
|
||||||
staging = fetchFromGitHub rec {
|
staging = fetchFromGitHub rec {
|
||||||
# https://github.com/wine-compholio/wine-staging/releases
|
# https://github.com/wine-compholio/wine-staging/releases
|
||||||
inherit (unstable) version;
|
inherit (unstable) version;
|
||||||
# FIXME update winestaging sources, when 3.3 is released
|
sha256 = "11cdymdd0qf8khhrakzj7qz12gx19h2a30r8bimbx6rriqryhlc2";
|
||||||
# FIXME then revert the staging derivation in ./default.nix
|
|
||||||
sha256 = "0000000000000000000000000000000000000000000000000000000000000000";
|
|
||||||
owner = "wine-staging";
|
owner = "wine-staging";
|
||||||
repo = "wine-staging";
|
repo = "wine-staging";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
|
|
Loading…
Reference in a new issue