winePackages.{stable,unstable,staging}: * -> 9.0; winetricks: 20230212 -> 20240105 #281905

SFrijters · 2024-01-18T23:32:08Z

Description of changes

https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0

Includes #279064 for convenience.

I haven't fully tested this yet; so far winePackages.staging builds on x86_64-linux.

Closes #281752

Things done

Add a 👍 reaction to pull requests you find important.

SFrijters · 2024-01-18T23:36:17Z

Do we want to act on

"The new WoW64 mode is not yet enabled by default. It can be enabled by passing the --enable-archs=i386,x86_64 option to configure. This is expected to work for most applications, but there are still some limitations, in particular:

Lack of support for 16-bit code.
Reduced OpenGL performance and lack of ARB_buffer_storage extension"
support.

nyabinary · 2024-01-18T23:39:05Z

Do we want to act on

"The new WoW64 mode is not yet enabled by default. It can be enabled by passing the --enable-archs=i386,x86_64 option to configure. This is expected to work for most applications, but there are still some limitations, in particular:
* Lack of support for 16-bit code.

* Reduced OpenGL performance and lack of ARB_buffer_storage extension"
  support.

In my opinion, yes, it seems worth the tradeoffs.

kirillrdy · 2024-01-18T23:57:13Z

The new WoW64 mode is not yet enabled by default.

we can make it an option ?

wegank · 2024-01-19T04:21:14Z

We already have wineWow64Packages, don't we?

nixpkgs/pkgs/applications/emulators/wine/packages.nix

Lines 45 to 55 in 2f611d6

    
           wineWow64 = callPackage ./base.nix { 
        
             pname = "wine-wow64"; 
        
             inherit src version supportFlags patches moltenvk; 
        
             pkgArches = [ pkgs ]; 
        
             mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ]; 
        
             geckos = [ gecko64 ]; 
        
             monos =  [ mono ]; 
        
             configureFlags = [ "--enable-archs=x86_64,i386" ]; 
        
             platforms = [ "x86_64-linux" "x86_64-darwin" ]; 
        
             mainProgram = "wine"; 
        
           };

kirillrdy · 2024-01-19T06:19:23Z

Right, so we don't need to do anything 😄

SFrijters · 2024-01-19T08:49:12Z

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

3 packages failed to build:

airwave
vinegar
wineWow64Packages.minimal

36 packages built:

exactaudiocopy
grapejuice
grapejuice.dist
pipelight
playonlinux
protontricks
protontricks.dist
q4wine
synthesia
vkd3d
vkd3d-proton
winbox
wine (winePackages.stableFull ,winePackages.unstableFull)
wine-staging (winePackages.stagingFull)
wine64 (wine64Packages.stableFull ,wine64Packages.unstableFull)
wine64Packages.base (wine64Packages.stable ,wine64Packages.unstable)
winePackages.fonts (wine64Packages.fonts ,wineWow64Packages.fonts ,wineWowPackages.fonts)
wine64Packages.minimal
wine64Packages.staging
wine64Packages.stagingFull
winePackages.base (winePackages.stable ,winePackages.unstable)
winePackages.minimal
winePackages.staging
wineWow64Packages.base (wineWow64Packages.stable ,wineWow64Packages.unstable)
wineWow64Packages.full (wineWow64Packages.stableFull ,wineWow64Packages.unstableFull)
wineWow64Packages.staging
wineWow64Packages.stagingFull
wineWowPackages.base (wineWowPackages.stable ,wineWowPackages.unstable)
wineWowPackages.full (wineWowPackages.stableFull ,wineWowPackages.unstableFull)
wineWowPackages.minimal
wineWowPackages.staging
wineWowPackages.stagingFull
wineasio
winetricks
yabridge
yabridgectl

Build failures:

vinegar: Patch doesn't apply to wine anymore; upstream has deemed it a NOTOURBUG https://bugs.winehq.org/show_bug.cgi?id=55604 so we may need to modify the patch if we want to keep it @nyanbinary
airwave: Missing non-free source file.
wineWow64Packages.minimal:

configure: error: MinGW x86_64 compiler not found.
This is an error since --enable-archs=x86_64 was requested.

SFrijters · 2024-01-19T10:02:46Z

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

1 package failed to build:

vinegar

38 packages built:

airwave
exactaudiocopy
grapejuice
grapejuice.dist
pipelight
playonlinux
protontricks
protontricks.dist
q4wine
synthesia
vkd3d
vkd3d-proton
winbox
wine (winePackages.stableFull ,winePackages.unstableFull)
wine-staging (winePackages.stagingFull)
wine64 (wine64Packages.stableFull ,wine64Packages.unstableFull)
wine64Packages.base (wine64Packages.stable ,wine64Packages.unstable)
winePackages.fonts (wine64Packages.fonts ,wineWow64Packages.fonts ,wineWowPackages.fonts)
wine64Packages.minimal
wine64Packages.staging
wine64Packages.stagingFull
winePackages.base (winePackages.stable ,winePackages.unstable)
winePackages.minimal
winePackages.staging
wineWow64Packages.base (wineWow64Packages.stable ,wineWow64Packages.unstable)
wineWow64Packages.full (wineWow64Packages.stableFull ,wineWow64Packages.unstableFull)
wineWow64Packages.minimal
wineWow64Packages.staging
wineWow64Packages.stagingFull
wineWowPackages.base (wineWowPackages.stable ,wineWowPackages.unstable)
wineWowPackages.full (wineWowPackages.stableFull ,wineWowPackages.unstableFull)
wineWowPackages.minimal
wineWowPackages.staging
wineWowPackages.stagingFull
wineasio
winetricks
yabridge
yabridgectl

Amanse · 2024-01-19T11:59:04Z

https://bugs.winehq.org/show_bug.cgi?id=55604 so we may need to modify the patch if we want to keep it @nyanbinary

small typo in username, @nyabinary is the correct one

nyabinary · 2024-01-19T15:20:41Z

Yeah the patches need to be updated for Wine 9.0 for Vinegar. (The patch is required for Roblox to run properly which is why we need it in the first place, to clarify.)

nyabinary · 2024-01-19T15:22:05Z

Also isn't Wayland support in mainline Wine 9.0 now? (Just disabled by default though)

Amanse · 2024-01-19T15:35:51Z

Also isn't Wayland support in mainline Wine 9.0 now? (Just disabled by default though)

yes, just need to add one registry entry in your prefix, no compile step or anything needed

SFrijters · 2024-01-19T16:15:53Z

small typo in username

Oops, I used the maintainer attribute from the package.nix file directly, but the actual GitHub username is different.

SuperSamus · 2024-01-19T18:28:55Z

no compile step or anything needed

It does need a few extra dependencies, though, which here are added only if the supportFlag waylandSupport is true.
Looking at the code, it is enabled only with wine-wayland, which is an old fork of Wine. This means that it's disabled on regular Wine (full supportFlags don't enable it).

(Thinking about it, is there any point on still having wine-wayland?)

SFrijters · 2024-01-19T18:41:09Z

Is the latest commit I added a step in the right direction w.r.t. wayland?

Amanse · 2024-01-19T18:45:27Z

which here are added only if the supportFlag waylandSupport is true.

ah yes, that makes sense, but it does compile without adding any extra dependency, i only changed source and it worked, did not check if wayland was working on the result, probably should check that

(Thinking about it, is there any point on still having wine-wayland?)

not really, will it even be updated now?

SuperSamus · 2024-01-19T18:48:26Z

I'd say that it's better to add waylandSupport = true to the full set, instead of having a dedicated wine-wayland package only for it. (Consider that the user also has to make some registry edits, it's something that is intentionally hidden. Making a dedicated package makes no sense, IMO)

Then, when it'll be more stable, it could be supported by base as well (or even right now, if it doesn't make the derivation significant bigger).

(BTW, relevant discussion on Arch)

SuperSamus · 2024-01-19T18:51:43Z

Also, the extra packages for Wayland are:
https://github.com/NixOS/nixpkgs/blob/21ab626da4ecc7ee570c32ff51f2690bf1ba18be/pkgs/applications/emulators/wine/base.nix#L102-L105

That was for wine-wayland, are all of them still needed?

Amanse · 2024-01-19T18:52:05Z

Then, when it'll be more stable, it could be supported by base as well (or even right now, if it doesn't make the derivation significant bigger).

Doing it right now seems fine, it is available in the base package in every other distro anyway

other distros being the distros where Wine gives official binary like debian,ubuntu and fedora

Amanse · 2024-01-19T18:59:57Z

are all of them still needed?

wine docs haven't updated yet on winehq but the patches in wine were from the same dev, so proobably? otherwise will need to compile and check

SFrijters · 2024-01-19T19:23:13Z

As I'm not a wayland user myself I propose to leave that particular cleanup out of this update and someone can make a followup for that? Or someone can add an update to this - I've stripped my proposed wayland change.

Amanse · 2024-01-19T19:49:17Z

I am trying to compile right now, changes that should be made according to me

waylandSupport flag set same as x11Support
not adding the -wayland prefix based on the supportFlag

Will it be better to remove wayland sources now all together or should they be kept to make a seperate wayland package?

Will report back with the results of compiling

edit: still compiling lol

Amanse · 2024-01-19T20:53:24Z

It compiles, i can put the commit in this PR if that is okay, although since it also removes the -wayland package maybe it should be different? or should that package stay?

nyabinary · 2024-02-16T13:54:50Z

Could we make wine-staging support overrideAttrs with this too?

isn't that possible with overlays?

wine-staging supports & uses overrideDerivation not overrideAttrs currently:

nixpkgs/pkgs/applications/emulators/wine/staging.nix

Line 10 in 5d4dd2a

(lib.overrideDerivation wineUnstable (self: {

did anyone do this btw?

Amanse · 2024-02-16T14:21:15Z

i tried with 9.1 but 9.1 has some patch mismatch (regardless of overrideDerivation or overrideAttrs) and wasn't compiling for me

reckenrode · 2024-02-16T15:59:13Z

I can do it with my Darwin cleanup. I use wine-staging in another derivation and need to add the msync patch. The lack of overrideAttrs is a bit painful. I’ll try to get something out next week regardless of the status of the overrideSDK changes.

nyabinary · 2024-02-16T16:12:54Z

I can do it with my Darwin cleanup. I use wine-staging in another derivation and need to add the msync patch. The lack of overrtideAttrs is a bit painful. I’ll try to get something out next week regardless of the status of the overrideSDK changes.

Nice, keep me posted! :3

winePackages.{stable,unstable,staging}: * -> 9.0; winetricks: 20230212 -> 20240105

SFrijters added 3 commits January 19, 2024 00:24

winePackages.stable: 8.0.2 -> 9.0

f60836e

winePackages.{unstable,staging}: 9.0-rc1 -> 9.0

352690d

winetricks: 20230212 -> 20240105

f5d7121

ofborg bot added 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Jan 18, 2024

wegank mentioned this pull request Jan 19, 2024

winetricks: 20230212 -> 20240105 #279064

Closed

wineWow64Packages.minimal: fix build

38f7be8

SFrijters force-pushed the wine-9.0 branch from a8e5e28 to 38f7be8 Compare January 19, 2024 19:21

SFrijters mentioned this pull request Feb 8, 2024

winePackages{unstable,staging}: 9.0 -> 9.2, cleanup #286580

Merged

13 tasks

coreyoconnor pushed a commit to coreyoconnor/nixpkgs that referenced this pull request Feb 26, 2024

Merge pull request NixOS#281905 from SFrijters/wine-9.0

7159970

winePackages.{stable,unstable,staging}: * -> 9.0; winetricks: 20230212 -> 20240105

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

winePackages.{stable,unstable,staging}: * -> 9.0; winetricks: 20230212 -> 20240105 #281905

winePackages.{stable,unstable,staging}: * -> 9.0; winetricks: 20230212 -> 20240105 #281905

SFrijters commented Jan 18, 2024

SFrijters commented Jan 18, 2024

nyabinary commented Jan 18, 2024

kirillrdy commented Jan 18, 2024 •

edited

Loading

wegank commented Jan 19, 2024

kirillrdy commented Jan 19, 2024

SFrijters commented Jan 19, 2024 •

edited

Loading

SFrijters commented Jan 19, 2024

Amanse commented Jan 19, 2024

nyabinary commented Jan 19, 2024 •

edited

Loading

nyabinary commented Jan 19, 2024

Amanse commented Jan 19, 2024

SFrijters commented Jan 19, 2024

SuperSamus commented Jan 19, 2024

SFrijters commented Jan 19, 2024

Amanse commented Jan 19, 2024 •

edited

Loading

SuperSamus commented Jan 19, 2024 •

edited

Loading

SuperSamus commented Jan 19, 2024 •

edited

Loading

Amanse commented Jan 19, 2024 •

edited

Loading

Amanse commented Jan 19, 2024

SFrijters commented Jan 19, 2024

Amanse commented Jan 19, 2024 •

edited

Loading

Amanse commented Jan 19, 2024

nyabinary commented Feb 16, 2024

Amanse commented Feb 16, 2024

reckenrode commented Feb 16, 2024 •

edited

Loading

nyabinary commented Feb 16, 2024 •

edited

Loading

winePackages.{stable,unstable,staging}: * -> 9.0; winetricks: 20230212 -> 20240105 #281905

winePackages.{stable,unstable,staging}: * -> 9.0; winetricks: 20230212 -> 20240105 #281905

Conversation

SFrijters commented Jan 18, 2024

Description of changes

Things done

SFrijters commented Jan 18, 2024

nyabinary commented Jan 18, 2024

kirillrdy commented Jan 18, 2024 • edited Loading

wegank commented Jan 19, 2024

kirillrdy commented Jan 19, 2024

SFrijters commented Jan 19, 2024 • edited Loading

SFrijters commented Jan 19, 2024

Amanse commented Jan 19, 2024

nyabinary commented Jan 19, 2024 • edited Loading

nyabinary commented Jan 19, 2024

Amanse commented Jan 19, 2024

SFrijters commented Jan 19, 2024

SuperSamus commented Jan 19, 2024

SFrijters commented Jan 19, 2024

Amanse commented Jan 19, 2024 • edited Loading

SuperSamus commented Jan 19, 2024 • edited Loading

SuperSamus commented Jan 19, 2024 • edited Loading

Amanse commented Jan 19, 2024 • edited Loading

Amanse commented Jan 19, 2024

SFrijters commented Jan 19, 2024

Amanse commented Jan 19, 2024 • edited Loading

Amanse commented Jan 19, 2024

nyabinary commented Feb 16, 2024

Amanse commented Feb 16, 2024

reckenrode commented Feb 16, 2024 • edited Loading

nyabinary commented Feb 16, 2024 • edited Loading

kirillrdy commented Jan 18, 2024 •

edited

Loading

SFrijters commented Jan 19, 2024 •

edited

Loading

nyabinary commented Jan 19, 2024 •

edited

Loading

Amanse commented Jan 19, 2024 •

edited

Loading

SuperSamus commented Jan 19, 2024 •

edited

Loading

SuperSamus commented Jan 19, 2024 •

edited

Loading

Amanse commented Jan 19, 2024 •

edited

Loading

Amanse commented Jan 19, 2024 •

edited

Loading

reckenrode commented Feb 16, 2024 •

edited

Loading

nyabinary commented Feb 16, 2024 •

edited

Loading