diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-26 10:10:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 10:10:28 +0100 |
| commit | 90cfaf1ab343eeb5dfa80bf56dfc6e66f88e613e (patch) | |
| tree | 95d30354d21ac547daa3464a92011196099dd012 /pkgs/misc/emulators | |
| parent | 458ff5a7a0a7f6a9a32bb53495faf64b902a1d47 (diff) | |
| parent | f8f067d62727b3c77dc0ac9d245808714f8500c0 (diff) | |
| download | nixlib-90cfaf1ab343eeb5dfa80bf56dfc6e66f88e613e.tar nixlib-90cfaf1ab343eeb5dfa80bf56dfc6e66f88e613e.tar.gz nixlib-90cfaf1ab343eeb5dfa80bf56dfc6e66f88e613e.tar.bz2 nixlib-90cfaf1ab343eeb5dfa80bf56dfc6e66f88e613e.tar.lz nixlib-90cfaf1ab343eeb5dfa80bf56dfc6e66f88e613e.tar.xz nixlib-90cfaf1ab343eeb5dfa80bf56dfc6e66f88e613e.tar.zst nixlib-90cfaf1ab343eeb5dfa80bf56dfc6e66f88e613e.zip | |
Merge pull request #37743 from ikervagyok/wine
wine: Unstable 3.3 -> 3.4 & reenable wineStaging
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 8 |
2 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 928e692df6b4..91fb0da82d8a 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -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 diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 5950310a73f7..d17c0f295e80 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -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}"; |