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

[20.09] wpsoffice: revert ffmpeg version #98989

Merged
merged 1 commit into from Sep 28, 2020
Merged

[20.09] wpsoffice: revert ffmpeg version #98989

merged 1 commit into from Sep 28, 2020

Conversation

7c6f434c
Copy link
Member

Partial revert of aa91966

Related to #98945

Motivation for this change

#98945

Clearly an improvement, although on my laptop the build hangs either way (unlike what reporter observes)

Will self-merge

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.

@7c6f434c
Merge pull request NixOS#98988 from 7c6f434c/wpsoffice-ffmpeg
bd07da3 
wpsoffice: keep using ffmpeg_3
(cherry picked from commit 064e082)
@7c6f434c 7c6f434c merged commit 2f9ab67 into NixOS:release-20.09 Sep 28, 2020
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 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@7c6f434c