diff options
author | Falco Peijnenburg <falco.peijnenburg@channable.com> | 2023-07-16 12:07:11 +0200 |
---|---|---|
committer | Falco Peijnenburg <falco.peijnenburg@channable.com> | 2023-07-16 12:33:20 +0200 |
commit | 1b62507fd7a9e01f117f1171d1c6633f63cb3646 (patch) | |
tree | cd97196aa6db1d35c39b158c9648e13503496ecb /pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix | |
parent | f0e8c9e00da07df1f6afed4b57a258e1043a28f6 (diff) |
vivaldi-ffmpeg-codecs: 112.0.5615.49 -> 111306
This now explicitly follows the `update-ffmpeg` script, which changed to using a snap instead of a .deb file downloaded from Launchpad.
Diffstat (limited to 'pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 68ba61e1cae0e..7dfb435aad5aa 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,22 +1,24 @@ -{ dpkg, fetchurl, lib, stdenv }: +{ squashfsTools, fetchurl, lib, stdenv }: +# This derivation roughly follows the update-ffmpeg script that ships with the official Vivaldi +# downloads at https://vivaldi.com/download/ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "112.0.5615.49"; + version = "111306"; src = fetchurl { - url = "https://launchpadlibrarian.net/660647727/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; - sha256 = "sha256-mHjvjRG+toRcsOMca+JPXNZPgyQROH2qtSpBPHLmt3s="; + url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_34.snap"; + sha256 = "sha256-Dna9yFgP7JeQLAeZWvSZ+eSMX2yQbX2/+mX0QC22lYY="; }; - buildInputs = [ dpkg ]; + buildInputs = [ squashfsTools ]; unpackPhase = '' - dpkg-deb -x $src . + unsquashfs -dest . $src ''; installPhase = '' - install -vD usr/lib/chromium-browser/libffmpeg.so $out/lib/libffmpeg.so + install -vD chromium-ffmpeg-${version}/chromium-ffmpeg/libffmpeg.so $out/lib/libffmpeg.so ''; meta = with lib; { @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://ffmpeg.org/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.lgpl21; - maintainers = with maintainers; [ betaboon cawilliamson lluchs ]; + maintainers = with maintainers; [ betaboon cawilliamson lluchs fptje ]; platforms = [ "x86_64-linux" ]; }; } |