From f0e8c9e00da07df1f6afed4b57a258e1043a28f6 Mon Sep 17 00:00:00 2001 From: Falco Peijnenburg Date: Sun, 16 Jul 2023 11:54:50 +0200 Subject: [PATCH 1/3] maintainers: add fptje --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index eeef17db5b1..7392079ea5f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5589,6 +5589,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"; From 1b62507fd7a9e01f117f1171d1c6633f63cb3646 Mon Sep 17 00:00:00 2001 From: Falco Peijnenburg Date: Sun, 16 Jul 2023 12:07:11 +0200 Subject: [PATCH 2/3] 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. --- .../browsers/vivaldi/ffmpeg-codecs.nix | 18 ++++++++++-------- 1 file 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 68ba61e1cae..7dfb435aad5 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" ]; }; } From ef2752b8068af39d6be9cc995a2e166cf182ef7d Mon Sep 17 00:00:00 2001 From: Falco Peijnenburg Date: Thu, 20 Jul 2023 21:25:20 +0200 Subject: [PATCH 3/3] Remove inactive maintainer lluchs --- pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 7dfb435aad5..5e49e35313e 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://ffmpeg.org/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.lgpl21; - maintainers = with maintainers; [ betaboon cawilliamson lluchs fptje ]; + maintainers = with maintainers; [ betaboon cawilliamson fptje ]; platforms = [ "x86_64-linux" ]; }; }