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-full: inherit src/version from ffmpeg #89786

Merged
merged 1 commit into from
Jun 9, 2020
Merged

ffmpeg-full: inherit src/version from ffmpeg #89786

merged 1 commit into from
Jun 9, 2020
+4 −7

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Jun 8, 2020 •
edited
Loading

Motivation for this change

I don't know why I didn't do this to begin with for #88561 (comment).

Helps a bit with #15930 as ffmpeg-full version will be inherited.

cc @marsam @Profpatsch

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 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.

Sorry, something went wrong.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jun 8, 2020
@Profpatsch
Copy link
Member

Why do we have two ffmpeg implementations in the first place? #15930

@zowoq
Copy link
Contributor Author

zowoq commented Jun 8, 2020

Why do we have two ffmpeg implementations in the first place?

I have no idea.

I'm only interested in ffmpeg_4 but I've been bumping ffmpeg_2_8 and ffmpeg-full so they aren't left behind.

With this all I'm doing is removing the need to bump it in two places.

@Profpatsch
Copy link
Member

kk, then let’s merge this and aim to remove one of the two implementations in the future.

@Profpatsch Profpatsch merged commit 2c79d7f into NixOS:master Jun 9, 2020
@zowoq zowoq deleted the ffmpeg-full branch June 9, 2020 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@zowoq @Profpatsch