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

electrum: update for the Qt5 change (#65399) #67727

Merged
merged 1 commit into from Sep 1, 2019

Conversation

deepfire
Copy link
Contributor

This fixes electrum, in line with the Qt update (#65399).

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

@deepfire deepfire force-pushed the serge/electrum branch 2 times, most recently from c5fa22f to 8053c68 Compare August 29, 2019 21:30
@deepfire deepfire changed the title Serge/electrum electrum: update for #65399 Aug 29, 2019
@deepfire deepfire changed the title electrum: update for #65399 electrum: update for the Qt5 change #65399 Aug 29, 2019
@deepfire deepfire changed the title electrum: update for the Qt5 change #65399 electrum: update for the Qt5 change (#65399) Aug 29, 2019
@@ -102,7 +104,8 @@ python3Packages.buildPythonApplication rec {
"Exec=$out/bin/electrum %u" \
--replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \
"Exec=$out/bin/electrum --testnet %u"
'';

'' + (if enableQt then "wrapQtApp $out/bin/electrum" else "");
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this should really happen in the postFixup phase

postFixup = lib.optionalString enableQt ''
  wrapQtApp $out/bin/electrum
'';

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

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.

LGTM, thanks for fixing this.

@worldofpeace worldofpeace merged commit e08cb1f into NixOS:master Sep 1, 2019
@gruve-p gruve-p mentioned this pull request Jan 24, 2022
13 tasks
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

3 participants