Merge branch 'staging-next' into staging

pkgs/applications/video/byzanz/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }:
+{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }:
 
 stdenv.mkDerivation {
   version = "0.2.3.alpha";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ]
+  buildInputs = [ which gnome.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ]
   ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]);
 
   meta = with lib; {

pkgs/applications/video/celluloid/default.nix

@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/celluloid-player/celluloid";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ worldofpeace ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/video/dvdstyler/default.nix

@@ -6,11 +6,14 @@
 , docbook5
 , dvdauthor
 , dvdplusrwtools
+, ffmpeg
 , flex
 , fontconfig
 , gettext
+, libexif
 , makeWrapper
 , pkg-config
+, wxGTK30
 , wxSVG
 , xine-ui
 , xmlto
@@ -42,11 +45,14 @@ in stdenv.mkDerivation rec {
     docbook5
     dvdauthor
     dvdplusrwtools
+    ffmpeg
     flex
     fontconfig
     gettext
+    libexif
     makeWrapper
     wxSVG
+    wxGTK30
     xine-ui
     xmlto
     zip
@@ -67,6 +73,8 @@ in stdenv.mkDerivation rec {
        wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}"
     '';
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     homepage = "https://www.dvdstyler.org/";
     description = "A DVD authoring software";

pkgs/applications/video/kodi-packages/osmc-skin/default.nix

@@ -15,7 +15,7 @@ buildKodiAddon rec {
     homepage = "https://github.com/osmc/skin.osmc";
     description = "The default skin for OSMC";
     platforms = platforms.all;
-    maintainers = with maintainers; [ worldofpeace ];
+    maintainers = with maintainers; [ ];
     license = licenses.cc-by-nc-sa-30;
   };
 }

pkgs/applications/video/peek/default.nix

@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/phw/peek";
     description = "Simple animated GIF screen recorder with an easy to use interface";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ puffnfresh worldofpeace ];
+    maintainers = with maintainers; [ puffnfresh ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/video/pitivi/default.nix

@@ -11,7 +11,7 @@
 , gobject-introspection
 , libpeas
 , librsvg
-, gnome3
+, gnome
 , libnotify
 , gsound
 , meson
@@ -52,9 +52,9 @@ python3Packages.buildPythonApplication rec {
     gtk3
     libpeas
     librsvg
-    gnome3.gnome-desktop
+    gnome.gnome-desktop
     gsound
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gsettings-desktop-schemas
     libnotify
   ] ++ (with gst_all_1; [
@@ -89,7 +89,7 @@ python3Packages.buildPythonApplication rec {
   strictDeps = false;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "pitivi";
       versionPolicy = "none"; # we are using dev version, since the stable one is too old
     };

pkgs/applications/video/qmediathekview/default.nix

@@ -1,13 +1,22 @@
-{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }:
+{ lib
+, stdenv
+, mkDerivation
+, fetchFromGitHub
+, boost
+, qtbase
+, xz
+, qmake
+, pkg-config
+}:
 
 mkDerivation rec {
   pname = "QMediathekView";
-  version = "2019-01-06";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "adamreichold";
     repo = pname;
-    rev = "e098aaec552ec4e367078bf19953a08067316b4b";
+    rev = "v${version}";
     sha256 = "0i9hac9alaajbra3lx23m0iiq6ww4is00lpbzg5x70agjrwj0nd6";
   };
 
@@ -16,7 +25,7 @@ mkDerivation rec {
       --replace /usr ""
   '';
 
-  buildInputs = [ qtbase qttools xz boost ];
+  buildInputs = [ qtbase xz boost ];
 
   nativeBuildInputs = [ qmake pkg-config ];
 
@@ -28,5 +37,6 @@ mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ dotlambda ];
+    broken = stdenv.isAarch64;
   };
 }

pkgs/applications/video/xine-ui/default.nix

@@ -46,8 +46,6 @@ stdenv.mkDerivation rec {
     xorgproto
   ]);
 
-  postPatch = "sed -e '/curl\/types\.h/d' -i src/xitk/download.c";
-
   configureFlags = [ "--with-readline=${readline.dev}" ];
 
   LIRC_CFLAGS="-I${lirc}/include";