nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-16 02:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vivaldi: fix patched paths

Browse Source
This commit is contained in:
Edmund Wu 2019-10-28 21:01:31 -04:00 committed by Jon
parent efc75b3eb3
commit ef086b6c17
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -51,8 +51,7 @@ in stdenv.mkDerivation rec {
--set-rpath "${libPath}" \
opt/${vivaldiName}/vivaldi-bin
'' + stdenv.lib.optionalString proprietaryCodecs ''
sed -i '/^if \[ "$VIVALDI_FFMPEG_FOUND/i \
VIVALDI_FFMPEG_FOUND=YES\nCACHED_FFMPEG=${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so' opt/${vivaldiName}/${vivaldiName}
ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*}
'' + ''
echo "Finished patching Vivaldi binaries"
'';
@ -82,7 +81,7 @@ in stdenv.mkDerivation rec {
--suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
'' + stdenv.lib.optionalString enableWidevine ''
ln -sf ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so
ln -sf ${vivaldi-widevine}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm
'';
meta = with stdenv.lib; {

11
pkgs/applications/networking/browsers/vivaldi/widevine.nix
View File

@ -14,12 +14,15 @@ stdenv.mkDerivation rec {
buildInputs = [ unzip ];
unpackPhase = ''
unzip $src libwidevinecdm.so
find .
unzip $src
'';
installPhase = ''
install -vD libwidevinecdm.so $out/lib/libwidevinecdm.so
installPhase = let
installDir = "$out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64";
in ''
install -vD libwidevinecdm.so ${installDir}/libwidevinecdm.so
install -vD manifest.json ${installDir}/manifest.json
install -vD LICENSE.txt ${installDir}/LICENSE.txt
'';
meta = with stdenv.lib; {