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

Merge pull request #243786 from FPtje/fp/update-ffmpeg-vivaldi

Browse Source 
vivaldi-ffmpeg-codecs 112.0.5615.49 -> 111306
This commit is contained in:
Sandro 2023-07-21 01:24:34 +02:00 committed by GitHub
commit a933c61045
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -5620,6 +5620,12 @@
githubId = 84968;
name = "Florian Paul Schmidt";
};
fptje = {
email = "fpeijnenburg@gmail.com";
github = "FPtje";
githubId = 1202014;
name = "Falco Peijnenburg";
};
fragamus = {
email = "innovative.engineer@gmail.com";
github = "fragamus";

18
pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
View File

@ -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 fptje ];
platforms = [ "x86_64-linux" ];
};
}