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

keysmith: replace hardcoded qt prefixes #97468

Closed
wants to merge 1 commit into from
Closed

Conversation

Thra11
Copy link
Member

@Thra11 Thra11 commented Sep 8, 2020

Motivation for this change

The keysmith package refers explicitly to Qt 5.12.7 in prefixes, but is now being built with Qt 5.14. I believe this change should mean that the prefixes will always match the Qt version which it is being built against.

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.

@Thra11
Copy link
Member Author

Thra11 commented Sep 8, 2020

Pinging maintainer @SCOTT-HAMILTON

Comment on lines 32 to +34
makeWrapper $out/bin/.org.kde.keysmith-wrapped $out/bin/org.kde.keysmith \
--set QML2_IMPORT_PATH "${lib.getLib kirigami2}/lib/qt-5.12.7/qml:${lib.getBin qtquickcontrols2}/lib/qt-5.12.7/qml:${lib.getBin qtdeclarative}/lib/qt-5.12.7/qml:${qtgraphicaleffects}/lib/qt-5.12.7/qml" \
--set QT_PLUGIN_PATH "${lib.getBin qtbase}/lib/qt-5.12.7/plugins"
--set QML2_IMPORT_PATH "${lib.getLib kirigami2}/${qtbase.qtQmlPrefix}:${lib.getBin qtquickcontrols2}/${qtbase.qtQmlPrefix}:${lib.getBin qtdeclarative}/${qtbase.qtQmlPrefix}:${qtgraphicaleffects}/${qtbase.qtQmlPrefix}" \
--set QT_PLUGIN_PATH "${lib.getBin qtbase}/${qtbase.qtPluginPrefix}"
Copy link
Contributor

Choose a reason for hiding this comment

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

this shouldn't be needed anymore, because qt's mkDerivaiton automatically adds wrapQtAppsHook which will make a wrapper with these entries (as long as they're in buildInputs`)

Copy link
Member Author

Choose a reason for hiding this comment

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

I did wonder why this was the only package doing this (and why I couldn't actually get the package to fail). Do we just remove the whole postInstall section then?

Copy link
Contributor

Choose a reason for hiding this comment

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

Some people couldn't run it on WM setup. This didn't fixed it but I kept it in case of.

Copy link
Contributor

Choose a reason for hiding this comment

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

@Thra11 It's likely an artifact of older packaging, because the wrappers for qt are relatively new.

@SuperSandro2000
Copy link
Member

@Thra11 please fix the merge conflict.

@SuperSandro2000
Copy link
Member

The relevant parts got removed. Closing.

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

4 participants