wine: Set WINELOADER in wrapper, wrap also wine64. #63817
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7c6f434c
approved these changes
Jun 27, 2019
ambrop72
force-pushed
the
wine-wrapper-fix
branch
from
1b35d23
to
e9ccfaf
Compare
|
Fixed two typos in comments (force push). |
Fixes NixOS#63170. Note that this brings back wrapping of wine64 which was removed in NixOS#28486 because the underlying issue is now fixed.
ambrop72
force-pushed
the
wine-wrapper-fix
branch
from
e9ccfaf
to
96c957f
Compare
|
Ping. This fixes widespread Wine breakage, it's nice to have a working Wine. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #63170. Note that this brings back wrapping of wine64 which was removed in #28486 because the underlying issue is now fixed.
Motivation for this change
Things done
Tested (on 19.03 branch) that with
wineWowPackages.full:winebootpopulates thesyswow64directory in addition tosystem32(before this fixsyswow64was not populated),wine <32-bit-exe>works,wine <64-bit-exe>works,wine64 <32-bit-exe>works,wine64 <64-bit-exe>works,running a 32-bit exe from within a 64-bit program works,
running a 64-bit exe from within a 32-bit program works.
Tested using sandboxing (nix.useSandbox on NixOS, or option
sandboxinnix.confon non-NixOS)Built on platform(s)
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 nix-review --run "nix-review wip"Tested execution of all binary files (usually in
./result/bin/)Determined the impact on package closure size (by running
nix path-info -Sbefore and after)Assured whether relevant documentation is up to date
Fits CONTRIBUTING.md.