vivaldi: widevine-support, fixed ffmpeg-support #63907
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NeQuissimus
approved these changes
Jun 28, 2019
eadwu
reviewed
Jun 29, 2019
| sed -i '/^VIVALDI_FFMPEG_FOUND/ a \ | ||
| checkffmpeg "${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so"' opt/${vivaldiName}/vivaldi | ||
| sed -i '/^if \[ "$VIVALDI_FFMPEG_FOUND/i \ | ||
| VIVALDI_FFMPEG_FOUND=YES\nCACHED_FFMPEG=${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so' opt/${vivaldiName}/vivaldi |
There was a problem hiding this comment.
opt/${vivaldiName}/vivaldi -> opt/${vivaldiName}/${vivaldiName} for compatibility with snapshots. Or fixing the symlink from opt/${vivaldiName}/${vivaldiName} to opt/${vivaldiName}/vivaldi.
| ${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} | ||
| '' + stdenv.lib.optionalString enableWidevine '' | ||
| rm $out/opt/vivaldi/libwidevinecdm.so | ||
| ln -s ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/vivaldi/libwidevinecdm.so |
There was a problem hiding this comment.
$out/opt/vivaldi -> $out/opt/${vivaldiName} for the same reason.
betaboon
force-pushed
the
pr-vivaldi-widevine-ffmpeg
branch
from
12e5ba7
to
cbbd10c
Compare
eadwu
added a commit
to eadwu/nixos-configuration
that referenced
this pull request
Apr 10, 2020
Codecs are now part of the derivation See NixOS/nixpkgs#63907
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
I wanted widevine-support in vivaldi to enable streaming drm-content (eg. netflix)
Things done
updated vivaldi-ffmpeg-codecs
fixed how ffmpeg-codecs is installed (the way vivaldi detects it has changed)
packages widevine-cdm from google
extended vivaldi to allow installing with widevine support
Tested using sandboxing (nix.useSandbox on NixOS, or option
sandboxinnix.confon non-NixOS)Built on platform(s)
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 nix-review --run "nix-review wip"Tested execution of all binary files (usually in
./result/bin/)Determined the impact on package closure size (by running
nix path-info -Sbefore and after)Assured whether relevant documentation is up to date
Fits CONTRIBUTING.md.