Navigation Menu

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.

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

wine{Unstable,Staging}: 5.20 -> 5.21 / wineStable: 5.0.2 -> 5.0.3 / airwave: mark as broken #103233

Closed
wants to merge 4 commits into from

Conversation

pstn
Copy link
Contributor

@pstn pstn commented Nov 9, 2020

Motivation for this change
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.

@pstn pstn marked this pull request as ready for review November 9, 2020 22:39
Copy link
Member

@SFrijters SFrijters left a comment

Choose a reason for hiding this comment

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

Built staging and used it to run my usual Wine applications, and it all LGTM.

@SFrijters
Copy link
Member

FYI, wineStable 5.0.3 was released today as well, maybe that could also go into this update.

@pstn
Copy link
Contributor Author

pstn commented Nov 11, 2020

Yes, that sounds reasonable testing right now, will update here when my CPU is done 😴

@pstn pstn changed the title wine{Unstable,Staging}: 5.20 -> 5.21 wine{Unstable,Staging}: 5.20 -> 5.21 / wineStable: 5.0.2 -> 5.0.3 Nov 11, 2020
@pstn
Copy link
Contributor Author

pstn commented Nov 11, 2020

Alright, had a successful build, pushed again for nix-review.

@pstn
Copy link
Contributor Author

pstn commented Nov 11, 2020

Also had to upgrade vst-sdk since I couldn't find the old sources any more in their dl page.

@pstn pstn changed the title wine{Unstable,Staging}: 5.20 -> 5.21 / wineStable: 5.0.2 -> 5.0.3 wine{Unstable,Staging}: 5.20 -> 5.21 / wineStable: 5.0.2 -> 5.0.3 / vst-sdk: vstsdk368_08_11_2017_build_121 -> vst-sdk_3.7.0_build-116_2020-07-31 Nov 11, 2020
@ikervagyok
Copy link
Contributor

Can we include this update as well? would reduce the rebuilds needed, if it lands together. #102142

@SFrijters
Copy link
Member

Issue while running nixpkgs-review on my end (still ongoing):

error: --- Error --- nix-daemon
builder for '/nix/store/h0gk3a0bq9piz2hz28rbd3pnkdwc3rm9-airwave-1.3.3.drv' failed with exit code 1; last 10 log lines:
  -- Detecting CXX compile features
  -- Detecting CXX compile features - done
  -- VSTSDK_PATH is set to /nix/store/65l493prjwzxvnj6dwyjh3jx1bbz4khi-vst-sdk_3.7.0_build-116_2020-07-31/VST2_SDK
  CMake Error at CMakeLists.txt:65 (message):
    VST SDK is not found.  You should set the VSTSDK_PATH variable to the
    directory, where your copy of the VST SDK is located.
  
  
  -- Configuring incomplete, errors occurred!
  See also "/build/source/build/CMakeFiles/CMakeOutput.log".

That's after downloading the SDK zip file by hand and adding it to the store as suggested by the requireFile builder. The nix store path exists and contains public.sdk, is that expected?

@pstn
Copy link
Contributor Author

pstn commented Nov 11, 2020

@ikervagyok Can do, but this is going to be hard on my CPU...

@SFrijters Yes, having that issue aswell. Working on a fix.

@SFrijters
Copy link
Member

The rest is fine for me btw:

1 package failed to build:
airwave

19 package built:
lutris lutris-free lutris-unwrapped pipelight playonlinux protontricks wine wineStaging wineMinimal wineStable winePackages.fonts winePackages.staging wineUnstable wineWowPackages.base wineWowPackages.full wineWowPackages.minimal wineWowPackages.staging wineWowPackages.unstable winetricks

@SFrijters SFrijters self-requested a review November 11, 2020 14:44
@pstn
Copy link
Contributor Author

pstn commented Nov 11, 2020

@SFrijters Can you tell me how the directory structure of vstsdk/VST2_SDK looked before my upgrade? I don't have the sources, so I can't check. Currently it's /nix/store/klij9p5z22p2j9m88va211ihn338dssq-vst-sdk_3.7.0_build-116_2020-07-31/VST2_SDK/public.sdk/source/vst2.x and then there are a bunch of header files in there.

Copy link
Contributor

@avnik avnik left a comment

Choose a reason for hiding this comment

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

unstable+staging match my own update (but you submit earlier) -- and it works well.
But I haven't idea about vst stuff

@ikervagyok
Copy link
Contributor

@pstn you dont have to include it, but these kind of auxiliary updates often fall short for a long time. I'll try with the next wine-release if it's too much for your cpu/patience.

@SFrijters
Copy link
Member

@pstn Unfortunately I don't have airwave on my system usually, so I don't have the old SDK sources in my store.
But maybe this helps: if I look at https://github.com/psycha0s/airwave the README consistently mentions VST3 instead of VST2, so maybe the fix is to set

- cmakeFlags = [ "-DVSTSDK_PATH=${vst-sdk}/VST2_SDK" ];
+ cmakeFlags = [ "-DVSTSDK_PATH=${vst-sdk}/VST3_SDK" ];

in airwave?

@pstn
Copy link
Contributor Author

pstn commented Nov 11, 2020

Already tried that to no avail.
I had a closer look at airwave and it seems like it's looking for the files aeffect.h aeffectx.h and can't find them because they aren't in the archive any more. Since that project seems to be on life support anyway, I propose to not upgrade vst-sdk and mark airwave as broken since it can't be built any more if you don't happen to have the right files.

@SFrijters
Copy link
Member

I agree with not updating the sdk / marking airwave as broken.

But weirdly, the previous version used in nixpkgs seems to available still at https://www.steinberg.net/sdk_downloads/vstsdk366_27_06_2016_build_61.zip . So we could also revert back to that and put a comment. But it seems like a losing battle.

@pstn pstn mentioned this pull request Nov 11, 2020
10 tasks
pstn and others added 2 commits November 11, 2020 18:46
Download for vstsdk is broken, doesn't build with new version.
@pstn pstn changed the title wine{Unstable,Staging}: 5.20 -> 5.21 / wineStable: 5.0.2 -> 5.0.3 / vst-sdk: vstsdk368_08_11_2017_build_121 -> vst-sdk_3.7.0_build-116_2020-07-31 wine{Unstable,Staging}: 5.20 -> 5.21 / wineStable: 5.0.2 -> 5.0.3 / airwave: mark as broken Nov 11, 2020
@pstn
Copy link
Contributor Author

pstn commented Nov 11, 2020

If I was working with airwave I rather had a warning because of a broken package with time to fix than something happening suddenly. If people already have that vstsdk version in their store, they can still build airwave and might have time to supply a proper fix themselves upstream.

@ikervagyok Added your wine-mono upgrade into this PR.

Copy link
Member

@SFrijters SFrijters left a comment

Choose a reason for hiding this comment

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

Did a nixpkgs-review on the latest again and got

1 package marked as broken and skipped:
airwave

19 package built:
lutris lutris-free lutris-unwrapped pipelight playonlinux protontricks wine wineStaging wineMinimal wineStable winePackages.fonts winePackages.staging wineUnstable wineWowPackages.base wineWowPackages.full wineWowPackages.minimal wineWowPackages.staging wineWowPackages.unstable winetricks

so LGTM.

@avnik
Copy link
Contributor

avnik commented Nov 22, 2020

Would be nice to have it merged, becasue 5.22 is on the go (and it need patching of cert-path.patch, @dasJ I will need your advice here)

@dasJ
Copy link
Member

dasJ commented Nov 22, 2020

Huh? Doesn't the patch apply?

@pstn
Copy link
Contributor Author

pstn commented Nov 22, 2020

I don't think this pr should be applied any more. Why merge an out of support version. Let's just merge 5.22 directly instead. I'll have a look.

@pstn
Copy link
Contributor Author

pstn commented Nov 22, 2020

@dasJ It seems like that file changed a lot since the 5.21.

@avnik
Copy link
Contributor

avnik commented Nov 23, 2020

@pstn I mean add one more commit with 5.22 on top of this, or merge it and do 5.22 separately due rootcert issue.
I like to see all versions in history.

@dasJ they split reading root certs between rootcert.c and dlls/crypt32/unixlib.c

PS btw, I thinking about side repo, with auto updating all wines by hashes on their site (and by pushing to wine-staging probably) -- what you think about it?

@pstn
Copy link
Contributor Author

pstn commented Nov 23, 2020

Sounds like a flake that I would use and contribute to if possible. It seems like especially wine-unstable/staging moves to fast nowadays for nixpkgs to keep up without a commiter with a strong interest in it, as this PR kind of proves.

@avnik
Copy link
Contributor

avnik commented Nov 23, 2020

@pstn exactly. And also be easier to update/propagate staging to nixpkgs. Is pretty safe to update automatically (after 1day grace period maybe, if it broken in siderepo -- someone can jus "vetoing" merging, marking is as brownbag)

@avnik
Copy link
Contributor

avnik commented Nov 23, 2020

I made new branch with commits from there, and new 5.22 and updated cert-root.patch, now building. Will do new PR as soon as it builds (it take ~3 hours)

@SFrijters
Copy link
Member

Superseded by #104719

@SFrijters SFrijters closed this Feb 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants