From 6de7e0d758ba82666df17ffa2335298ad5b064e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sun, 25 Apr 2021 23:08:55 +0200
Subject: [PATCH 1/2] libsForQt5.qtwebengine: use ffmpeg instead of ffmpeg_3
---
pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index e2ca47f45f2c..032fd1c4fb3c 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -15,7 +15,7 @@
, enableProprietaryCodecs ? true
, gn
, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin
-, ffmpeg_3 ? null
+, ffmpeg ? null
, lib, stdenv, fetchpatch
, version ? null
, qtCompatVersion
@@ -159,7 +159,7 @@ qtModule {
libevent
] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
- ffmpeg_3
+ ffmpeg
] ++ optionals (!stdenv.isDarwin) [
dbus zlib minizip snappy nss protobuf jsoncpp
From 6ba83717fed92b708edf25a2165fe7b57bebf369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 1 May 2021 16:10:26 +0200
Subject: [PATCH 2/2] libsForQt5.qtwebengine: always use system ffmpeg
---
pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 032fd1c4fb3c..571c17dc4cfc 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -140,9 +140,8 @@ qtModule {
fi
'';
- qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64
- then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs"
- else optional enableProprietaryCodecs "-- -proprietary-codecs";
+ qmakeFlags = [ "--" "-system-ffmpeg" ]
+ ++ optional enableProprietaryCodecs "-proprietary-codecs";
propagatedBuildInputs = [
# Image formats
@@ -158,7 +157,6 @@ qtModule {
harfbuzz icu
libevent
- ] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
ffmpeg
] ++ optionals (!stdenv.isDarwin) [
dbus zlib minizip snappy nss protobuf jsoncpp