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.

Sign up for GitHub

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

gst-plugins-good: Add optional qt5Support #110608

Merged
merged 2 commits into from Feb 23, 2021
Merged

gst-plugins-good: Add optional qt5Support #110608

merged 2 commits into from Feb 23, 2021

Conversation

pstn
Copy link
Contributor

@pstn pstn commented Jan 23, 2021 •
edited

Motivation for this change

nheko video calling (Drafted in PR #110595) needs qmlgl, so I put a switch into gst-plugins-good to enable it.
I put another switch in for lreleaseSupport, because I don't think it's necessary in most cases but I would be happy to see it when I needed it while working on something.

While working on it, I saw that pulse was disabled twice in the same block, so I also fixed that in another commit.

Thanks @rnhmjoj for the help,
ping @matthewbauer

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 pr 110608"
  • 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.

@pstn pstn marked this pull request as ready for review January 23, 2021 17:02
@pstn pstn changed the title Gstqt5 gst-plugins-good: Add optional qt5Support Jan 23, 2021
@pstn pstn mentioned this pull request Jan 23, 2021
Merged
10 tasks
SuperSandro2000
SuperSandro2000 requested changes Jan 23, 2021
View reviewed changes
pkgs/development/libraries/gstreamer/good/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/gstreamer/good/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/gstreamer/good/default.nix
@@ -102,6 +104,13 @@ stdenv.mkDerivation rec {
] ++ optionals gtkSupport [
# for gtksink
gtk3
] ++ optionals qt5Support (with qt5; [
Copy link
Member

Choose a reason for hiding this comment

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

I don't think you want to input qt5 directly but use libforQt5 in callPackages.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Are there docs on that?

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure it's really needed... libsForQt5.callPackage ensures all the dependencies are using the same Qt version, which is significant for a Qt application but this is a library and I don't think any other dependency depends on Qt.

Copy link
Member

Choose a reason for hiding this comment

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

relevant documentation https://nixos.org/manual/nixpkgs/stable/#sec-language-qt

pkgs/development/libraries/gstreamer/good/default.nix Outdated Show resolved Hide resolved
@ofborg ofborg bot requested a review from matthewbauer January 23, 2021 17:24
@rnhmjoj
Copy link
Contributor

rnhmjoj commented Jan 24, 2021 •
edited

So, I've investigated a bit the lrelease situation. This is a tool needed to compile translation files used by Qt applications.
I looked at the gst-plugins-good sources and found no mentions of translation (no TRANSLATIONS variable in the .pro or .ts files). Since the project builds and works without it I assume the meson message (Program lrelease found: NO) is a product of some default template/code generation but it can be ignored.

I think lreleaseSupport and qttools can be removed entirely.

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Feb 21, 2021

I'd like to get this merged before the other nheko PR. Can you drop the qtrelease thing so we can go on?

@pstn
Copy link
Contributor Author

pstn commented Feb 22, 2021

Whoops, I thought I already did that. Here you go.

rnhmjoj
rnhmjoj approved these changes Feb 23, 2021
View reviewed changes
Copy link
Contributor

@rnhmjoj rnhmjoj left a comment

Choose a reason for hiding this comment

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

So, enabling qt5Support gives a 780M increase to the closure size, so it's definitely better to keep it disabled by default. I also tested that gst-plugins-good and nheko build.

@rnhmjoj rnhmjoj merged commit 3642025 into NixOS:master Feb 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@symphorien symphorien symphorien left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

@rnhmjoj rnhmjoj rnhmjoj approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@pstn @rnhmjoj @SuperSandro2000 @symphorien