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

Initial stab at making X11 a configurable dependency of intel-media-drivers #73277

Merged
merged 1 commit into from Jan 8, 2021
Merged

Initial stab at making X11 a configurable dependency of intel-media-drivers #73277

merged 1 commit into from Jan 8, 2021

Conversation

robashton
Copy link
Contributor

Motivation for this change

Issue #73236

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 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 @jfrankenau ?

@ofborg ofborg bot requested a review from jfrankenau November 12, 2019 11:03
@doronbehar
Copy link
Contributor

@vcunat could you review this please?

@vcunat vcunat mentioned this pull request Jul 1, 2020
Closed
@primeos primeos linked an issue Jul 1, 2020 that may be closed by this pull request
libX11 dev-dependency in intel-media-driver causes runtime problems #73236
Closed
primeos
primeos requested changes Jul 12, 2020
View reviewed changes
Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

Sorry about the delay.

Unfortunately I cannot test this easily as I'm on Wayland but the idea and diff LGTM with my proposed changes (not tested, might contain syntax errors). Could you apply them (if you agree with the changes) and give it a final test before we merge this PR?

pkgs/development/libraries/intel-media-driver/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/intel-media-driver/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/intel-media-driver/default.nix Outdated Show resolved Hide resolved
@robashton
Copy link
Contributor Author

I don't have the knowledge/experience to disagree with anything! I'll pull latest tomorrow and make the appropriate change and see what happens :)

@vcunat
Copy link
Member

vcunat commented Jul 12, 2020

I think nowadays the generic packageOverrides mechanism is preferred to nixpkgs.config for this purpose, though it's a bit more chatty and I'm not aware of this preference being written down anywhere.

@primeos primeos self-assigned this Jan 8, 2021
@robashton @primeos
intel-media-driver: Fix runtime issues due to the libX11 dependency
0e061a8 
X11 is an optional run-time and optional build-time dependency of iHD.
A patchelf is required to join these two worlds together, and a lot of
machines that'll run the intel-media-driver won't have X11 on them, so
make it optional.

Fix NixOS#73236.

Co-Authored-By: Michael Weiss <dev.primeos@gmail.com>
@ofborg ofborg bot requested a review from primeos January 8, 2021 13:57
primeos
primeos approved these changes Jan 8, 2021
View reviewed changes
Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

I decided to finalize this by myself to get this merged/done. Cannot verify if this fixes the other issue but the diff suggests it and I briefly tested that this does still work with mpv on Wayland.

@primeos primeos merged commit 95dc08e into NixOS:master Jan 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@primeos primeos primeos approved these changes

@doronbehar doronbehar doronbehar approved these changes

@jfrankenau jfrankenau Awaiting requested review from jfrankenau

Assignees

@primeos primeos

Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

libX11 dev-dependency in intel-media-driver causes runtime problems
6 participants
@robashton @doronbehar @vcunat @primeos @ryantm @Janik-Haag