From 3d82efbc4c892d46ce4c357212ff43ce0f2b5ef6 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Sat, 17 Feb 2024 09:57:31 +0100
Subject: [PATCH] update xwaylandvideobridge

---
 pkgs/default.nix             |  2 +-
 pkgs/xwaylandvideobridge.nix | 74 +++++++++++++++++-------------------
 2 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 2e1faf8..7fe420e 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -41,7 +41,7 @@
       libscrc = pyself.callPackage ./libscrc.nix {};
     };
   };
-  xwaylandvideobridge = self.callPackage ./xwaylandvideobridge.nix {};
+  xwaylandvideobridge = self.libsForQt5.callPackage ./xwaylandvideobridge.nix {};
   timesync = self.flake-inputs.timesync.packages.${self.system}.default;
   wl-clipboard = super.wl-clipboard.overrideAttrs (o: {
     # todo: upstream
diff --git a/pkgs/xwaylandvideobridge.nix b/pkgs/xwaylandvideobridge.nix
index 3031928..189151f 100644
--- a/pkgs/xwaylandvideobridge.nix
+++ b/pkgs/xwaylandvideobridge.nix
@@ -1,52 +1,48 @@
-{ stdenv
-, fetchFromGitLab
+{ lib
+, stdenv
+, fetchurl
 , cmake
-, fetchpatch
-, pkg-config
 , extra-cmake-modules
-, qt5
-, libsForQt5
-}: stdenv.mkDerivation rec {
-  pname = "xwaylandvideobridge";
-  version = "unstable-2023-06-04";
+, pkg-config
+, qtbase
+, qtquickcontrols2
+, qtx11extras
+, kdelibs4support
+, kpipewire
+, wrapQtAppsHook
+}:
 
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "system";
-    repo = "xwaylandvideobridge";
-    rev = "75f68526fb3d2a4e1af6644e49dfdc8d9e56985c";
-    hash = "sha256-GvutiwF9FxtZ2ehd6dsR3ZY8Mq6/4k1TDpz+xE8SusE=";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xwaylandvideobridge";
+  version = "0.4.0";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/xwaylandvideobridge/xwaylandvideobridge-${finalAttrs.version}.tar.xz";
+    hash = "sha256-6nKseypnV46ZlNywYZYC6tMJekb7kzZmHaIA5jkn6+Y=";
   };
 
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
     pkg-config
-    qt5.wrapQtAppsHook
-  ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/cursor-mode.patch?h=xwaylandvideobridge-cursor-mode-2-git";
-      hash = "sha256-649kCs3Fsz8VCgGpZ952Zgl8txAcTgakLoMusaJQYa4=";
-    })
+    wrapQtAppsHook
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qtquickcontrols2
-    qt5.qtx11extras
-    libsForQt5.kdelibs4support
-    (libsForQt5.kpipewire.overrideAttrs (oldAttrs: {
-      version = "5.27.5";
-
-      src = fetchFromGitLab {
-        domain = "invent.kde.org";
-        owner = "plasma";
-        repo = "kpipewire";
-        rev = "v5.27.5";
-        hash = "sha256-xcuSWURiyY9iuayeY9w6G59UJTbYXyPWGg8x+EiXNsY=";
-      };
-    }))
+    qtbase
+    qtquickcontrols2
+    qtx11extras
+    kdelibs4support
+    kpipewire
   ];
-}
+
+  meta = {
+    description = "Utility to allow streaming Wayland windows to X applications";
+    homepage = "https://invent.kde.org/system/xwaylandvideobridge";
+    license = with lib.licenses; [ bsd3 cc0 gpl2Plus ];
+    maintainers = with lib.maintainers; [ stepbrobd ];
+    platforms = lib.platforms.linux;
+    mainProgram = "xwaylandvideobridge";
+  };
+})
+