diff options
author | Edmund Wu <fangkazuto@gmail.com> | 2019-10-28 21:01:31 -0400 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-02-12 07:10:52 -0800 |
commit | ef086b6c175b8e14abf1715750db21ff351bb953 (patch) | |
tree | e78941038e79ce53d06bfd25b607d45640fbf113 /pkgs/applications | |
parent | efc75b3eb3044cefa2fcf596f6e1684e226ccd4d (diff) | |
download | nixlib-ef086b6c175b8e14abf1715750db21ff351bb953.tar nixlib-ef086b6c175b8e14abf1715750db21ff351bb953.tar.gz nixlib-ef086b6c175b8e14abf1715750db21ff351bb953.tar.bz2 nixlib-ef086b6c175b8e14abf1715750db21ff351bb953.tar.lz nixlib-ef086b6c175b8e14abf1715750db21ff351bb953.tar.xz nixlib-ef086b6c175b8e14abf1715750db21ff351bb953.tar.zst nixlib-ef086b6c175b8e14abf1715750db21ff351bb953.zip |
vivaldi: fix patched paths
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/browsers/vivaldi/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/vivaldi/widevine.nix | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 73a0bfdbb7e3..ce3530728aa2 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -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; { diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix index a21de1acad28..756a655eddf7 100644 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -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; { |