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

bitwig-studio2: 2.3.5 -> 2.4.3 #53451

Merged
merged 4 commits into from Jan 31, 2019
Merged

bitwig-studio2: 2.3.5 -> 2.4.3 #53451

merged 4 commits into from Jan 31, 2019

Conversation

ghost
Copy link

@ghost ghost commented Jan 5, 2019

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@FRidh
Copy link
Member

FRidh commented Jan 5, 2019

I recommend using (auto)patchelf instead of using LD_LIBRARY_PATH. Note that studio1 does both.

@ghost
Copy link
Author

ghost commented Jan 5, 2019

@FRidh Interesting. I see that bitwig-studio2 also adds ffmpeg to binPath, but that doesn't get added in resulting wrapper.

@ghost
Copy link
Author

ghost commented Jan 6, 2019

@FRidh How about that? Not yet tested thoroughly though.

@FRidh
Copy link
Member

FRidh commented Jan 6, 2019

Check with the maintainers of the expressions.

@ghost
Copy link
Author

ghost commented Jan 7, 2019

@michalrus @mrVanDalo What do you think?

@ghost ghost changed the title bitwig-studio2: support pulseaudio bitwig-studio2: 2.3.5 -> 2.4.3 Jan 8, 2019
@mrVanDalo
Copy link
Contributor

mrVanDalo commented Jan 9, 2019

@gnidorah I tested bitwig-studio1, save and open does not work anymore:

com.bitwig.base.io.ProcessException: Error executing command zenity --file-selection --title "Save Project" --save --confirm-overwrite --file-filter "Bitwig Project | *.bwproject | *.bwsong | *.fls" --filename "/home/palo/Bitwig Studio/Projects/": Cannot run program "zenity": error=2, No such file or directory

I guess zenity is missing.

I tested it using nix-review pr 53451 and ./result/bitwig-studio1/bin/bitwig-studio

I couldn't test it for bitwig-studio2 because I don't have a license and the demo version has open and save disabled.

@ghost
Copy link
Author

ghost commented Jan 9, 2019

@mrVanDalo Thanks! I've only tested VSTs, controller and tracks switching 😦 You're correct that I've broke file dialogs. runtimeDependencies add dependencies to RPATH, while we need them in PATH, so I've reverted that change.
In addition, I see that bitwig-studio1 misses ffmpeg in PATH, so its impossible to drag&drop mp3 files from files panel onto audio track. Added it, now that function works (tracks playback also works).

@mrVanDalo
Copy link
Contributor

@gnidorah I checked your changes for bitwig-studio1 and everything seem fine. Again couldn't test bitwig-studio2. For me it's a go.

@christoph00 christoph00 mentioned this pull request Jan 15, 2019
10 tasks
@ghost
Copy link
Author

ghost commented Jan 17, 2019

@christoph00 could you please test and confirm that this pr works for you? You could use nix-review pr 53451 command for that

@christoph00
Copy link
Contributor

@christoph00 could you please test and confirm that this pr works for you? You could use nix-review pr 53451 command for that

Open/Save Dialogs do not work.

@ghost
Copy link
Author

ghost commented Jan 18, 2019

@christoph00 Strange, they work for me.

@ghost
Copy link
Author

ghost commented Jan 27, 2019

@poelzi @smashedtoatoms @alesguzik Does this PR works for any of you? Particularly Open/Save Dialogs.

@Mic92
Copy link
Member

Mic92 commented Jan 27, 2019

@gnidorah @christoph00 cannot open file dialogs because bitwig is missing the wrapGAppsHook, which would add desktop schema files and other modules.
This could look like this: ac8acb2
Also you don't need glib and gnome3.gsettings_desktop_schemas when you already have gtk in your buildInputs.

@ghost
Copy link
Author

ghost commented Jan 27, 2019

@Mic92 Thanks! This way? I have no such issue, so can't test whether my last change fixed it.

@christoph00
Copy link
Contributor

I have still no Dialogs. Do I need some gtk stuff? Im using plasma5

They are not yet set in the installPhase.
@Mic92
Copy link
Member

Mic92 commented Jan 30, 2019

The gappsWrapperArgs are only available in the fixup phase. I fixed that
and now it adds the desktop schemacs correctly.
I cannot test this because I don't have a license, so please @christoph00 test again.

wrapProgram $f \
--prefix PATH : "${binPath}" \
--prefix LD_LIBRARY_PATH : "${libPath}" \
"''${gappsWrapperArgs[@]}" \
--set LD_PRELOAD "${libxkbcommon.out}/lib/libxkbcommon.so" || true
Copy link
Member

Choose a reason for hiding this comment

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

It might be a bit cleaner though to just extend gappsWrapperArgs and remove dontWrapGApps

gappsWrapperArgs+=("--prefix" "PATH" ":" "${binPath}")
gappsWrapperArgs+=("--set" "LD_PRELOAD" "${libxkbcommon.out}/lib/libxkbcommon.so")

@christoph00
Copy link
Contributor

Working now, thank you @Mic92

@Mic92 Mic92 merged commit e629328 into NixOS:master Jan 31, 2019
@ghost
Copy link
Author

ghost commented Jan 31, 2019

@Mic92 thank you!

@ghost ghost deleted the bitwig branch January 31, 2019 14:05
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

5 participants