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

gst-plugins-good: Add missing xfixes/xdamage dependencies #54463

Merged
merged 1 commit into from Mar 30, 2019

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Jan 22, 2019

Based on #54380, merge that first (done).

Motivation for this change

Fixes mouse curser not being visible (show-pointer=true and use-damage=true having no effect) in ximagesrc.

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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@@ -6,6 +6,7 @@
, libsoup, libpulseaudio, libintl
, darwin, lame, mpg123, twolame
, gtkSupport ? false, gtk3 ? null
, xorg
Copy link
Member

Choose a reason for hiding this comment

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

as far as I remember, xorg entries are also searched automatically by callPackage, so you can ask for libXfixes and libXdamage directly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is that better though? I find it very implicit / non-obvious that this works, given that libXfixes is not in a top-level all-packages entry.

Copy link
Member

Choose a reason for hiding this comment

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

Well, callPackage is supposed to use top-level and xorg definitions. Maybe a few refactorings back, when callPackage was defined inside all-packages.nix and not splice.nix, it was a bit more evident…

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Where is it described how that works and what it will pass?

Unless it's described somewhere so it's obvious to readers where it comes from, I'd like to use the current approach which leaves no doubt.

Copy link
Member

Choose a reason for hiding this comment

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

callPackage, and especially what it actually does — let alone how, is basically not described well anywhere (I could say

/* Call the package function in the file `fn' with the required
and https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/splice.nix#L124 and the second place does mention xorg, but it is not exactly easy to find without having an idea in advance)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I take this as an argument for using the explicit approach I have for now -- unless I misunderstood.

Copy link
Member

Choose a reason for hiding this comment

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

No, basically all of non-server Nixpkgs break if top-level callPackage stops passing stuff from xorg, so the expectation is to rely on this behviour.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, I've switched to using them directly instead via xorg.

@nh2
Copy link
Contributor Author

nh2 commented Jan 22, 2019

I've updated the PR to also depend on libXfixes as revealed by the upstream response to my issue: https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/commit/e234932dc703e51a0e1aa3b9c408f12758b12335

@nh2
Copy link
Contributor Author

nh2 commented Jan 23, 2019

I've addressed the SRT-related comments in #54380, and rebased this.

#54380 is ready to merge from my side.

After it's merged, this one is ready too from my side.

I'm impartial on the topic of #54463 (comment), whichever you guys think is cleaner.

@nh2
Copy link
Contributor Author

nh2 commented Feb 11, 2019

After it's merged, this one is ready too from my side.

That merge is done now; ready from my side.

Fixes mouse curser not being visible (show-pointer=true and use-damage=true
having no effect) in `ximagesrc`.
@nh2
Copy link
Contributor Author

nh2 commented Mar 30, 2019

Since the refactoring/renaming didn't change the derivation, merging.

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

5 participants