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

vapoursynth-editor: use qt's mkDerivation #72465

Merged
merged 1 commit into from Nov 1, 2019

Conversation

tadeokondrak
Copy link
Member

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 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 @

@tadeokondrak tadeokondrak mentioned this pull request Nov 1, 2019
10 tasks
@worldofpeace
Copy link
Contributor

This needs a backport.

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

This program is already wrapped, so wrapQtAppsHook will ignore wrapping it. This is because it ignores scripts.

What you can do is use wrapQtApp in place of wrapProgram and set dontWrapQtApps = true; as we're wrapping manually. You should then remove makeWrapper from this expression.

@worldofpeace
Copy link
Contributor

Note, wrapping should happen in preFixup. Not the installPhase.

@tadeokondrak
Copy link
Member Author

This program is already wrapped, so wrapQtAppsHook will ignore wrapping it. This is because it ignores scripts.

It does seem to work anyway, but wrapping a program twice probably isn't great.
Fixed, if it looks good I'll make a backport PR.

@worldofpeace
Copy link
Contributor

This program is already wrapped, so wrapQtAppsHook will ignore wrapping it. This is because it ignores scripts.

It does seem to work anyway, but wrapping a program twice probably isn't great.
Fixed, if it looks good I'll make a backport PR.

This was the content of the wrapper without using wrapQtApp

#! /nix/store/zavn4np1jvm79f0rafkv0p1mrag09qkz-bash-4.4-p23/bin/bash -e
export PYTHONPATH='/nix/store/f5fz7wa9nixd7qpzh6a1rp1ij7bxw0xq-vapoursynth-R47.2/lib/python3.7/site-packages'${PYTHONPATH:+':'}$PYTHONPATH
export LD_LIBRARY_PATH='/nix/store/f5fz7wa9nixd7qpzh6a1rp1ij7bxw0xq-vapoursynth-R47.2/lib'${LD_LIBRARY_PATH:+':'}$LD_LIBRARY_PATH
exec -a "$0" "/nix/store/mbbql8hkf5b8kplkji3h469wf5b6avk6-vapoursynth-editor-R19/bin/.vsedit-wrapped"  "$@"

so it was actually broken.

Here's the content of the wrapper in the latest commit

#! /nix/store/zavn4np1jvm79f0rafkv0p1mrag09qkz-bash-4.4-p23/bin/bash -e
export QT_PLUGIN_PATH='/nix/store/js39qrk4i5i5my3nl317dniqk4sp5dgi-qtbase-5.12.5-bin/lib/qt-5.12.5/plugins'${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
export QT_PLUGIN_PATH='/nix/store/x507783mf613yhaksqcj2bpy14mrwa8l-qtsvg-5.12.5-bin/lib/qt-5.12.5/plugins'${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
export QT_PLUGIN_PATH='/nix/store/phka1gjvm55kmw7jw9nmm7aa62q7anlf-qtdeclarative-5.12.5-bin/lib/qt-5.12.5/plugins'${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
export QML2_IMPORT_PATH='/nix/store/phka1gjvm55kmw7jw9nmm7aa62q7anlf-qtdeclarative-5.12.5-bin/lib/qt-5.12.5/qml'${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
export QML2_IMPORT_PATH='/nix/store/cl4r46fmcihpig1slcpmm1s2bx72cv5h-qtquickcontrols-5.12.5/lib/qt-5.12.5/qml'${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
export QT_PLUGIN_PATH='/nix/store/ays1cry94qjil280jjh9j283f2pkb74j-qtwayland-5.12.5-bin/lib/qt-5.12.5/plugins'${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
export QML2_IMPORT_PATH='/nix/store/ays1cry94qjil280jjh9j283f2pkb74j-qtwayland-5.12.5-bin/lib/qt-5.12.5/qml'${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
export QML2_IMPORT_PATH='/nix/store/kq988pbxyp5pwz54k51xdg54ljlva5w2-qtwebsockets-5.12.5-bin/lib/qt-5.12.5/qml'${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
export PYTHONPATH='/nix/store/f5fz7wa9nixd7qpzh6a1rp1ij7bxw0xq-vapoursynth-R47.2/lib/python3.7/site-packages'${PYTHONPATH:+':'}$PYTHONPATH
export LD_LIBRARY_PATH='/nix/store/f5fz7wa9nixd7qpzh6a1rp1ij7bxw0xq-vapoursynth-R47.2/lib'${LD_LIBRARY_PATH:+':'}$LD_LIBRARY_PATH
exec -a "$0" "/nix/store/819qdp87gc22j989vqyn8kqmwrl2q5nv-vapoursynth-editor-R19/bin/.vsedit-wrapped"  "$@"

LGTM 👍 I can perform the backport manually for you as well.

@worldofpeace worldofpeace merged commit 328fbf3 into NixOS:master Nov 1, 2019
@tadeokondrak
Copy link
Member Author

This was the content of the wrapper without using wrapQtApp

Yeah, .vsedit-wrapped actually was another wrapper script that called ..vsedit-wrapped-wrapped.

LGTM +1 I can perform the backport manually for you as well.

Thanks!

@worldofpeace
Copy link
Contributor

worldofpeace commented Nov 1, 2019

backported in 82b6998.

Thanks!

No problem, thank you too ✨

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