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/wine/default.nix | |
| 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/wine/default.nix')
| -rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 11 |
1 files changed, 4 insertions, 7 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 |