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

ffmpeg: build fixes #43556

Merged
merged 2 commits into from Jul 15, 2018
Merged

ffmpeg: build fixes #43556

merged 2 commits into from Jul 15, 2018

Conversation

thefloweringash
Copy link
Member

@thefloweringash thefloweringash commented Jul 15, 2018 •
edited

Motivation for this change

The pkg-config files for ffmpeg_3 and ffmpeg_4 use an incorrect includedir, which prevents them being used through pkg-config.

While I'm here: fix a typo in the cross compilation flags.

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)
  • Fits CONTRIBUTING.md.

@vcunat
Copy link
Member

vcunat commented Jul 15, 2018

Hmm, that certainly does seem a typo from 7864a17, at a shallow look at least; /cc @Ericson2314 anyway.

@vcunat vcunat merged commit 342f72e into NixOS:master Jul 15, 2018
vcunat added a commit that referenced this pull request Jul 15, 2018
@vcunat
Merge #43556: ffmpeg: build fixes
ba8cb47
@thefloweringash thefloweringash deleted the ffmpeg-build-fixes branch July 23, 2018 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@thefloweringash @vcunat @GrahamcOfBorg