Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'

v#	modified:   nixpkgs/pkgs/tools/networking/dhcpcd/default.nix

1 files changed, 11 insertions, 32 deletions

diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index ec2646440b31..3207409a6ba5 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -1,53 +1,32 @@
 { stdenv, fetchurl
-, dbus-glib, gtk3, libexif, libXScrnSaver, ninja, nss
-, pciutils, pkgconfig, python2, xdg_utils, gn, at-spi2-core
+, dpkg
 }:
 
 stdenv.mkDerivation rec {
-  name = "${product}-${version}";
-  product = "vivaldi-ffmpeg-codecs";
-  version = "72.0.3626.122";
+  name = "chromium-codecs-ffmpeg";
+  version = "74.0.3729.169";
 
   src = fetchurl {
-    url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
-    sha512 = "1477g5dgi4m0zbiqwm9w6jqkmjfmgjlbl3qs9ljldx8bif8my1jbz4hzws954aqxyxdbf5rjpvmrrqqppk5347prvsyl37rbsndaaqf";
+    url = "https://launchpadlibrarian.net/424938057/${name}-extra_${version}-0ubuntu0.16.04.1_amd64.deb";
+    sha256 = "1ls2fshfk08hqsfvbd7p6rp2gv3n0xdy86rdh00wiz5qgl3skfzc";
   };
 
-  buildInputs = [ ];
+  buildInputs = [ dpkg ];
 
-  nativeBuildInputs = [
-    gtk3 libexif libXScrnSaver ninja nss pciutils python2 xdg_utils gn
-    pkgconfig dbus-glib at-spi2-core.dev
-  ];
-
-  patches = [
-  ];
-
-  configurePhase = ''
-    runHook preConfigure
-
-    local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gnome_keyring=false use_sysroot=false use_gold=false use_allocator=\"none\" linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false enable_nacl=false enable_nacl_nonsfi=false is_clang=false clang_use_chrome_plugins=false is_component_build=true is_debug=false symbol_level=0 use_custom_libcxx=false use_lld=false use_jumbo_build=false"
-    gn gen out/Release -v --args="$args"
-
-    runHook postConfigure
+  unpackPhase = ''
+    dpkg-deb -x $src .
+    find .
   '';
 
-  buildPhase = ''
-    ninja -C out/Release -v libffmpeg.so
-  '';
-
-  dontStrip = true;
-
   installPhase = ''
-    mkdir -p "$out/lib"
-    cp out/Release/libffmpeg.so "$out/lib/libffmpeg.so"
+    install -vD usr/lib/chromium-browser/libffmpeg.so $out/lib/libffmpeg.so
   '';
 
   meta = with stdenv.lib; {
     description = "Additional support for proprietary codecs for Vivaldi";
     homepage    = "https://ffmpeg.org/";
     license     = licenses.lgpl21;
-    maintainers = with maintainers; [ lluchs ];
+    maintainers = with maintainers; [ betaboon lluchs ];
     platforms   = [ "x86_64-linux" ];
   };
 }