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

Jump to bottom

picard: add optional qtmultimedia dependency #83482

Merged
merged 3 commits into from Mar 31, 2020
Merged

picard: add optional qtmultimedia dependency #83482

merged 3 commits into from Mar 31, 2020

Conversation

doronbehar
Copy link
Contributor

@doronbehar doronbehar commented Mar 27, 2020 •
edited

Motivation for this change

Enable to Fix this harmless error on startup:

W: 11:34:59,057 /nix/store/nhrp6qwqgvk34dvdrm7icalwqdi2h9a2-picard-2.3.1/lib/python3.7/site-packages/picard/ui/playertoolbar.__init__:106: Internal player: unavailable, cannot import name 'QtMultimedia' from 'PyQt5' (/nix/store/y5q9hfgg7pk9khgd0q45bms7gmk9nvnx-python3.7-PyQt5.sip-4.19.18/lib/python3.7/site-packages/PyQt5/__init__.py)

And make the integrated media player work.

Things done
  • Added new enablePlayback flag set by default to false which adds qt5.qtmultimedia to nativeBuildInputs and "chooses" the right pyqt5 build flavor.
  • Added a passthru for pyqt5 that should be useful to easily indicate packages including it that it has (e.g) multimediaEnabled.
  • 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.

@ofborg ofborg bot requested a review from ehmry March 27, 2020 10:15
jonringer
jonringer reviewed Mar 27, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

double wrapping still occuring:

[nix-shell:/home/jon/.cache/nixpkgs-review/pr-83482]$ ./results/picard/bin/
picard                    .picard-wrapped           ..picard-wrapped-wrapped

unfortunately, I don't think the python wrapper accepts arguments yet...

pkgs/applications/audio/picard/default.nix Show resolved Hide resolved
pkgs/applications/audio/picard/default.nix Outdated Show resolved Hide resolved
@doronbehar
Copy link
Contributor Author

Ping @timokau .

@timokau timokau merged commit c9bf23e into NixOS:master Mar 31, 2020
@doronbehar doronbehar deleted the improve-picard branch March 2, 2023 10:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@FRidh FRidh Awaiting requested review from FRidh

@ehmry ehmry Awaiting requested review from ehmry

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@doronbehar @ehmry @jonringer @timokau