Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wineStaging: fix mingwSupport #107916

Merged
merged 1 commit into from Dec 30, 2020
Merged

wineStaging: fix mingwSupport #107916

merged 1 commit into from Dec 30, 2020

Conversation

kira-bruneau
Copy link
Contributor

@kira-bruneau kira-bruneau commented Dec 29, 2020 •
edited

Motivation for this change

Fix mingwSupport for staging builds of wine. See #103102.

@mweinelt I was able to get WoW running with:

wineWowPackages.full.override {
  wineRelease = "staging";
  mingwSupport = true;
}
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@avnik @bendlas @7c6f434c @cawilliamson

@kira-bruneau
Copy link
Contributor Author

kira-bruneau commented Dec 29, 2020 •
edited

Result of nixpkgs-review pr 107916 run on x86_64-linux 1

1 package failed to build:
  • airwave
18 packages built:
  • lutris
  • lutris-free
  • lutris-unwrapped
  • pipelight
  • playonlinux
  • protontricks
  • wine (wineFull)
  • wineStaging (wine-staging)
  • wineMinimal (winePackages.minimal)
  • wineStable (winePackages.base)
  • winePackages.staging
  • wineUnstable (winePackages.unstable)
  • wineWowPackages.base (wineWowPackages.stable)
  • wineWowPackages.full
  • wineWowPackages.minimal
  • wineWowPackages.staging
  • wineWowPackages.unstable
  • winetricks
builder for '/nix/store/cbr3ff9sdkm8iamm6h88bjfq0hf4hcsg-vstsdk368_08_11_2017_build_121.zip.drv' failed with exit code 1; last 10 log lines:
  ***
  Unfortunately, we cannot download file vstsdk368_08_11_2017_build_121.zip automatically.
  Please go to http://www.steinberg.net/en/company/developers.html to download it yourself, and add it to the Nix store
  using either
    nix-store --add-fixed sha256 vstsdk368_08_11_2017_build_121.zip
  or
    nix-prefetch-url --type sha256 file:///path/to/vstsdk368_08_11_2017_build_121.zip

  ***
cannot build derivation '/nix/store/10llwbwpa5f51pjw7a9amprznvd29nia-vstsdk368_08_11_2017_build_121.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/6z088k5q93zgbbksh7dac6v3ik05df5a-airwave-1.3.3.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/c1vwrqm7wqnc7iq6q7j89v6aiah4ggj8-env.drv': 1 dependencies couldn't be built
error: --- Error ------------------------------------------------------------------- nix

@ofborg ofborg bot requested review from avnik, bendlas and 7c6f434c December 29, 2020 22:16
@mweinelt
Copy link
Member

Airwave is already broken on target branch, so no biggie.

SuperSandro2000
SuperSandro2000 reviewed Dec 30, 2020
View reviewed changes
pkgs/misc/emulators/wine/base.nix Outdated Show resolved Hide resolved
pkgs/misc/emulators/wine/base.nix Outdated Show resolved Hide resolved
@mweinelt
Copy link
Member

@MetaDark I can start up WoW, but the screen sadly remains black. Audio works. Keybinds on the login screen seem to work as well.

I'm on wayland with amdgpu. Are you applying anything else to your wine prefix? How did you set it up? Just WINEARCH=win64?

@kira-bruneau
Copy link
Contributor Author

kira-bruneau commented Dec 30, 2020 •
edited

@mweinelt I just launched it from Lutris with this configuration:

game:
  exe: /home/kira/Games/wow/drive_c/Program Files (x86)/World of Warcraft/_retail_/Wow.exe
  prefix: /home/kira/Games/wow
system: {}
wine:
  custom_wine_path: /nix/store/wa8sp6dqnh63yr50d2dc3qnfcsqw9xx4-wine-wow-5.22-staging/bin/wine

I'm also using amdgpu on wayland (specifically with sway & an RX 590)

@kira-bruneau
Copy link
Contributor Author

kira-bruneau commented Dec 30, 2020 •
edited

Hmm weird, I just tried launching with:

WINEPREFIX=/home/kira/Games/wow /nix/store/wa8sp6dqnh63yr50d2dc3qnfcsqw9xx4-wine-wow-5.22-staging/bin/wine '/home/kira/Games/wow/drive_c/Program Files (x86)/World of Warcraft/_retail_/Wow.exe'

and I'm getting the same issue. I wonder what Lutris is adding that's causing it to load properly 🤔 .

@kira-bruneau
Copy link
Contributor Author

kira-bruneau commented Dec 30, 2020 •
edited

@mweinelt I disabled Enable DXVK/VKD3D and was able to reproduce it through lutris. You might need to install dxvk: winetricks dxvk

@7c6f434c 7c6f434c merged commit 7699bf1 into NixOS:master Dec 30, 2020
@avnik
Copy link
Contributor

avnik commented Dec 30, 2020

Just FYU dxvk don't work on old GPU . Also I plan to switch to mingw as default at some point after 6.0 release.

@kira-bruneau
Copy link
Contributor Author

@avnik Once staging-next is merged into master, stripping will be re-enabled on Wine, so there won't be an overhead with debug symbols anymore.

@mweinelt
Copy link
Member

@mweinelt I disabled Enable DXVK/VKD3D and was able to reproduce it through lutris. You might need to install dxvk: winetricks dxvk

Works like a charm. Thank you.

@kira-bruneau kira-bruneau deleted the wineStaging branch January 4, 2021 04:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@avnik avnik Awaiting requested review from avnik

@bendlas bendlas Awaiting requested review from bendlas

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@kira-bruneau @mweinelt @avnik @SuperSandro2000 @7c6f434c