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

mixxx: drop custom wrapper #66285

Merged
merged 1 commit into from Aug 7, 2019
Merged

mixxx: drop custom wrapper #66285

merged 1 commit into from Aug 7, 2019

Conversation

worldofpeace
Copy link
Contributor

@worldofpeace worldofpeace commented Aug 7, 2019

This prevented it from being wrapped
automatically because it wasn't an ELF
header.

Motivation for this change

cc @sam-willis this is actually how we have to fix this, can you test it?

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 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 -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

This prevented it from being wrapped
automatically because it wasn't an ELF
header.
@sam-willis
Copy link
Contributor

Thanks for that, I made an attempt to use qtWrapperArgs, but couldn't get it to build. I'll test it later tonight.

@worldofpeace
Copy link
Contributor Author

I think I can merge this now, I'm certain it will fix your issue because the wrapper contains

wrapper content
#! /nix/store/xfghy8ixrhz3kyy6p724iv3cxji088dx-bash-4.4-p23/bin/bash -e
export LOCALE_ARCHIVE='/nix/store/h2b4ci4c6qs5d28lgwv9lzm02jfxcpgn-glibc-locales-2.27/lib/locale/locale-archive'
export QT_PLUGIN_PATH='/nix/store/qa3faa7dy41wxd1y2ldmg5fzc3pdwb10-qtbase-5.12.0-bin/lib/qt-5.12/plugins'${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
export QT_PLUGIN_PATH='/nix/store/js4fqglx52l2gb8f1ad34r8b11xj3y5w-qtsvg-5.12.0-bin/lib/qt-5.12/plugins'${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
export QT_PLUGIN_PATH='/nix/store/xvifggs4vc2czi95gir0gpvm45ysin3s-qtdeclarative-5.12.0-bin/lib/qt-5.12/plugins'${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
export QML2_IMPORT_PATH='/nix/store/xvifggs4vc2czi95gir0gpvm45ysin3s-qtdeclarative-5.12.0-bin/lib/qt-5.12/qml'${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
export QML2_IMPORT_PATH='/nix/store/319j582m94yaar88d6qk03rgm658l26f-qtquickcontrols-5.12.0/lib/qt-5.12/qml'${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
export QT_PLUGIN_PATH='/nix/store/wn784aaax0q85l5inf71ayngs14sli61-qtwayland-5.12.0-bin/lib/qt-5.12/plugins'${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
export QML2_IMPORT_PATH='/nix/store/wn784aaax0q85l5inf71ayngs14sli61-qtwayland-5.12.0-bin/lib/qt-5.12/qml'${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
export XDG_DATA_DIRS='/nix/store/q42dpq909szb8f3v695d585hcncnrak6-mixxx-2.2.1/share'${XDG_DATA_DIRS:+':'}$XDG_DATA_DIRS
exec -a "$0" "/nix/store/q42dpq909szb8f3v695d585hcncnrak6-mixxx-2.2.1/bin/.mixxx-wrapped"  "${extraFlagsArray[@]}" "$@"

Which you've already verified worked for you.
Additionally the application works for me when ran on NixOS in a pure nix-shell and outside of one.
(note I'm not in a qt based environment)

@sam-willis
Copy link
Contributor

I think I just enough have time to build before heading out. It's compiling now, when it's done I'll report if I can start the application

@sam-willis
Copy link
Contributor

sam-willis commented Aug 7, 2019

Yes, I can run the binary - NixOS x86_64

@worldofpeace
Copy link
Contributor Author

Yes, I can run the binary

Thank you, that's very considerate of you since you should be heading out 😄

@worldofpeace worldofpeace merged commit 55aa81a into NixOS:master Aug 7, 2019
@worldofpeace worldofpeace deleted the mixxx branch August 7, 2019 17:27
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

2 participants