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

ffmpeg: extend addOpenGLRunpath to handle libcuda referencing libraries #87968

Merged
merged 1 commit into from May 16, 2020

Conversation

@elohmeier
Copy link
Contributor

elohmeier commented May 16, 2020

Motivation for this change

ffmpeg won't use Nvidia cuda hw-acceleration in libavutil. See also #87588. Fixes #77834.

Things done

Setup addOpenGLRunpath to handle libcuda referencing libraries.

  • 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.
@flokli
Copy link
Contributor

flokli commented May 16, 2020

Hmmm - due to some other commit in staging, /nix/store/x48v9kmvhq4xz587cq8zqb87hpd5z9yy-groff-1.22.4.drv fails to build.

I rebased this commit on top of an earlier version of staging.

@flokli flokli force-pushed the elohmeier:ffmpeg-addOpenGLRunpath2 branch from bb83762 to d68480a May 16, 2020
@flokli flokli force-pushed the elohmeier:ffmpeg-addOpenGLRunpath2 branch from d68480a to 78987e2 May 16, 2020
@flokli flokli merged commit a42e336 into NixOS:staging May 16, 2020
1 check was pending
1 check was pending
grahamcofborg-eval Checking original out paths
Details
@flokli
Copy link
Contributor

flokli commented May 16, 2020

Backported to staging-20.03 in fc12091.

@elohmeier elohmeier deleted the elohmeier:ffmpeg-addOpenGLRunpath2 branch May 17, 2020
@elohmeier
Copy link
Contributor Author

elohmeier commented May 17, 2020

Awesome, thanks!

@roberth roberth mentioned this pull request May 18, 2020
0 of 10 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.