Skip to content

wine{Unstable,Staging}: 7.4 -> 7.8; winetricks: 20210825 -> 20220411#170943

Merged
7c6f434c merged 6 commits intoNixOS:masterfrom
SFrijters:wine-7.7
May 14, 2022
Merged

wine{Unstable,Staging}: 7.4 -> 7.8; winetricks: 20210825 -> 20220411#170943
7c6f434c merged 6 commits intoNixOS:masterfrom
SFrijters:wine-7.7

Conversation

@SFrijters
Copy link
Member

Description of changes

Three upstream version bumps.
However, it seems that even wine 7.4 doesn't build on master anymore for me.
This is to be investigated.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Apr 29, 2022
@SFrijters SFrijters changed the title wine{Unstable,Staging}: 7.4 -> 7.7; winetricks: 20210825 -> 20220411 wine{Unstable,Staging}: 7.4 -> 7.8; winetricks: 20210825 -> 20220411 May 6, 2022
@SFrijters
Copy link
Member Author

Still trying to find out how/when/why we lost the ability to parallel build...

@ofborg ofborg bot requested review from 7c6f434c, avnik, bendlas and jmc-figueira May 6, 2022 22:53
@bendlas
Copy link
Contributor

bendlas commented May 7, 2022

Still trying to find out how/when/why we lost the ability to parallel build...

how does this manifest?

@SFrijters
Copy link
Member Author

SFrijters commented May 7, 2022

My NixOS config uses 12 cores by default, and from the moment I started building the PR I'm getting errors like

/nix/store/8x3b9g3hjyw1fdkfry01yhp8lkccnfi7-x86_64-w64-mingw32-binutils-2.38/bin/x86_64-w64-mingw32-dlltool: dlls/iphlpapi/libiphlpapi.delay.a: error reading iphlpapi_dll_s00001.o: No such file or directory
winebuild: /nix/store/8x3b9g3hjyw1fdkfry01yhp8lkccnfi7-x86_64-w64-mingw32-binutils-2.38/bin/x86_64-w64-mingw32-dlltool failed with status 1
make: *** [Makefile:96346: dlls/iphlpapi/libiphlpapi.delay.a] Error 1
make: *** Waiting for unfinished jobs....
/nix/store/8x3b9g3hjyw1fdkfry01yhp8lkccnfi7-x86_64-w64-mingw32-binutils-2.38/bin/x86_64-w64-mingw32-dlltool: dlls/iphlpapi/libiphlpapi.cross.a: error reading iphlpapi_dll_t.o: No such file or directory
winebuild: /nix/store/8x3b9g3hjyw1fdkfry01yhp8lkccnfi7-x86_64-w64-mingw32-binutils-2.38/bin/x86_64-w64-mingw32-dlltool failed with status 1
make: *** [Makefile:96346: dlls/iphlpapi/libiphlpapi.cross.a] Error 1

When I build wine 7.4 off its original commit dd6c709 I see no such problem (35619ce is still okay as well). But on current master (without this PR) I do get it. It's been a huge pain trying to bisect the problem because of the long compile times.

Setting enableParallelBuilding = false; makes it go away, but that will make rebuilding the wine variants take way too much time.

@Philipp-M
Copy link
Member

Just tested this and it's working fine for me (better indeed than 7.4 since a few of my applications stopped working with it).

I would suggest merging this, since it's better to have a version that compiles slowly than not at all.

And investigate the parallel building issue separately.

@SFrijters
Copy link
Member Author

I can remove the draft status if people want, but I probably won't run the full nixpkgs-review on it since that will now trigger so many serialized builds...

@SFrijters
Copy link
Member Author

Would be nice to get #172617 first, then we can probably keep parallel builds enabled.

@SFrijters SFrijters marked this pull request as ready for review May 12, 2022 10:55
@SFrijters SFrijters marked this pull request as draft May 12, 2022 10:58
@SFrijters
Copy link
Member Author

SFrijters commented May 12, 2022

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

25 packages built:
  • grapejuice
  • lutris
  • lutris-free
  • lutris-unwrapped
  • pipelight
  • protontricks
  • winbox
  • wine-staging (winePackages.stagingFull)
  • wine-wayland (winePackages.waylandFull)
  • wine64Packages.staging
  • wine64Packages.stagingFull
  • wine64Packages.unstable
  • wine64Packages.unstableFull
  • wine64Packages.waylandFull
  • winePackages.staging
  • winePackages.unstable
  • winePackages.unstableFull
  • wineWowPackages.staging
  • wineWowPackages.stagingFull
  • wineWowPackages.unstable
  • wineWowPackages.unstableFull
  • wineWowPackages.waylandFull
  • winetricks
  • yabridge
  • yabridgectl

Built this using only 2 cores per build, that seems to sidestep the dlltool issue sufficiently.

@SFrijters SFrijters marked this pull request as ready for review May 12, 2022 17:03
@Philipp-M
Copy link
Member

I'd like to test/review it as is, but honestly I don't know how to reduce the count of build-cores.

I tried something like:

NIX_BUILD_CORES=1 nix build -j 1 .#wineWowPackages.staging

But that's not working...

Regardless of that, I would suggest setting enableParallelBuilding = false so that no-one else runs into this issue, and set it back to true in this PR: #172617

@SFrijters
Copy link
Member Author

I took out the big hammer and set my nix.settings.cores to 2 on my NixOS system for the occasion.

Since hydra was still happy building wine until now I figured I'd leave the enableParallelBuilding alone because the build should end up in the binary cache soon, but I can go either way.

Copy link
Member

@Philipp-M Philipp-M left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@7c6f434c 7c6f434c merged commit 561813c into NixOS:master May 14, 2022
@SFrijters SFrijters deleted the wine-7.7 branch May 15, 2022 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants