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-full: setup addOpenGLRunpath #87588

Merged
merged 1 commit into from May 16, 2020
Merged

Conversation

@elohmeier
Copy link
Contributor

elohmeier commented May 11, 2020

Motivation for this change

addOpenGLRunpath was missing in pkgs.ffmpeg-full, preventing users to make use of hardware acceleration when encoding.

Things done

Backported addOpenGLRunpath from pkgs.ffmpeg.

  • 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.
@elohmeier elohmeier force-pushed the elohmeier:ffmpeg-addOpenGLRunpath branch from 145f1d1 to b30bb20 May 14, 2020
@elohmeier
Copy link
Contributor Author

elohmeier commented May 14, 2020

I think this fix should also be backported to 20.03.

@flokli
Copy link
Contributor

flokli commented May 14, 2020

Hmm - the change to ffmpeg causes a large rebuild, so this would need to go via staging.

Could you drop the ffmpeg commit, and open this one into staging? Happy to backport the ffmpeg-full one into 20.03 (and the ffmpeg one into staging-20.03, once its merged)

@flokli flokli mentioned this pull request May 14, 2020
8 of 10 tasks complete
@elohmeier elohmeier force-pushed the elohmeier:ffmpeg-addOpenGLRunpath branch from b30bb20 to 8a21c43 May 16, 2020
@elohmeier
Copy link
Contributor Author

elohmeier commented May 16, 2020

@flokli I've just split it up into another PR for ffmpeg (to staging), #87968.

@flokli
Copy link
Contributor

flokli commented May 16, 2020

I changed the addOpenGLRunpath $out/lib/lib….so* to addOpenGLRunpath $out/lib/lib….so, as there's only one "real" .so.X.Y.Z library, and the rest is less specific symlinks pointing to that file.

@flokli flokli force-pushed the elohmeier:ffmpeg-addOpenGLRunpath branch from 8a21c43 to 9663877 May 16, 2020
@flokli flokli merged commit 1f20788 into NixOS:master May 16, 2020
@flokli
Copy link
Contributor

flokli commented May 16, 2020

Backported to 20.03 in 885a665.

@elohmeier
Copy link
Contributor Author

elohmeier commented May 17, 2020

Awesome, thanks!

@elohmeier elohmeier deleted the elohmeier:ffmpeg-addOpenGLRunpath branch May 17, 2020
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

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