public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vivaldi: fix patched paths

Browse Source
This commit is contained in:
Edmund Wu
2020-02-12 07:10:52 -08:00
committed by Jon
parent efc75b3eb3
commit ef086b6c17
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/browsers/vivaldi/default.nix
+2 -3
View File
@@ -51,8 +51,7 @@ in stdenv.mkDerivation rec {
--set-rpath "${libPath}" \ --set-rpath "${libPath}" \
opt/${vivaldiName}/vivaldi-bin opt/${vivaldiName}/vivaldi-bin
'' + stdenv.lib.optionalString proprietaryCodecs '' '' + stdenv.lib.optionalString proprietaryCodecs ''
sed -i '/^if \[ "$VIVALDI_FFMPEG_FOUND/i \ ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*}
VIVALDI_FFMPEG_FOUND=YES\nCACHED_FFMPEG=${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so' opt/${vivaldiName}/${vivaldiName}
'' + '' '' + ''
echo "Finished patching Vivaldi binaries" echo "Finished patching Vivaldi binaries"
''; '';
@@ -82,7 +81,7 @@ in stdenv.mkDerivation rec {
--suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} ${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
'' + stdenv.lib.optionalString enableWidevine '' '' + 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; { meta = with stdenv.lib; {
pkgs/applications/networking/browsers/vivaldi/widevine.nix
+7 -4
View File
@@ -14,12 +14,15 @@ stdenv.mkDerivation rec {
buildInputs = [ unzip ]; buildInputs = [ unzip ];
unpackPhase = '' unpackPhase = ''
unzip $src libwidevinecdm.so unzip $src
find .
''; '';
installPhase = '' installPhase = let
install -vD libwidevinecdm.so $out/lib/libwidevinecdm.so 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; { meta = with stdenv.lib; {