Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: fa534f3509d9
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6ff341dee56b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 15, 2018

  1. wine: correct install order for WoW wine build. 

    Per the wiki at https://wiki.winehq.org/Building_Wine#Shared_WoW64

"if you do choose to install your WoW64 build, you should run make
install in the 32-bit build tree first, then in the 64-bit one."

This is required, for instance, for the resulting "wineserver"
executable to be the 64 bit variant not 32 bit. Which is expected by the
binary loader for WoW64.

This odd dependency is vaguely mentioned on the packaging wiki page:

* https://wiki.winehq.org/Packaging#Binaries
    @coreyoconnor
    coreyoconnor committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    7f112e3 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2018

  1. Merge pull request #37064 from coreyoconnor/wine-correct-install-order 

    wine: correct install order for WoW wine build.
    @Mic92
    Mic92 committed Mar 18, 2018
    Configuration menu
    Copy the full SHA
    6ff341d View commit details
    Browse the repository at this point in the history