From ac446d87f7f54349deeb09ea3f126acfa5f9c0a5 Mon Sep 17 00:00:00 2001
From: deltadelta <contact@libellules.eu>
Date: Sun, 13 Feb 2022 17:07:34 +0100
Subject: [PATCH 1/3] dino: 0.2.2 -> 0.3.0

---
 .../networking/instant-messengers/dino/default.nix   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index bb2576cdf5f8..b6e54bc30e85 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,17 +13,18 @@
 , pcre
 , qrencode
 , icu
+, gspell, srtp, libnice, gnutls, gst_all_1
  }:
 
 stdenv.mkDerivation rec {
   pname = "dino";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
     rev = "v${version}";
-    sha256 = "sha256-uYP3D2uyvfRP91fq/1jKOaKgp/+How0SUwmxSrLLH4c=";
+    sha256 = "sha256-L5a5QlF9qlr4X/hGTabbbvOE5J1x/UVneWl/BRAa29Q=";
   };
 
   nativeBuildInputs = [
@@ -56,6 +57,13 @@ stdenv.mkDerivation rec {
     icu
     libsignal-protocol-c
     librsvg
+    gspell
+    srtp
+    libnice
+    gnutls
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
   ] ++ lib.optionals (!stdenv.isDarwin) [
     xorg.libxcb
     xorg.libpthreadstubs

From 64c2db945d29aced2566d1dd0d8d62fb91950c99 Mon Sep 17 00:00:00 2001
From: deltadelta <contact@libellules.eu>
Date: Mon, 14 Feb 2022 19:07:54 +0100
Subject: [PATCH 2/3] dino: pass only required parts of gst_all_1

---
 .../networking/instant-messengers/dino/default.nix       | 9 +++++----
 pkgs/top-level/all-packages.nix                          | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index b6e54bc30e85..3e992899e43e 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,7 +13,8 @@
 , pcre
 , qrencode
 , icu
-, gspell, srtp, libnice, gnutls, gst_all_1
+, gspell
+, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good
  }:
 
 stdenv.mkDerivation rec {
@@ -61,9 +62,9 @@ stdenv.mkDerivation rec {
     srtp
     libnice
     gnutls
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
   ] ++ lib.optionals (!stdenv.isDarwin) [
     xorg.libxcb
     xorg.libpthreadstubs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5598d98409d5..45976f1af141 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2866,7 +2866,10 @@ with pkgs;
 
   ditaa = callPackage ../tools/graphics/ditaa { };
 
-  dino = callPackage ../applications/networking/instant-messengers/dino { };
+  dino = callPackage ../applications/networking/instant-messengers/dino {
+    inherit (gst_all_1) gstreamer gst-plugins-base;
+    gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
+  };
 
   djv = callPackage ../applications/graphics/djv { };
 

From 312f5ca1cebc7c510f58760afc3201104c56a93a Mon Sep 17 00:00:00 2001
From: deltadelta <contact@libellules.eu>
Date: Thu, 17 Feb 2022 18:14:52 +0100
Subject: [PATCH 3/3] dino: mention update in release notes

---
 nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 6 ++++++
 nixos/doc/manual/release-notes/rl-2205.section.md          | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 50cf06c94eed..9de918e2349c 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -875,6 +875,12 @@
           <literal>programs.starship.settings</literal>.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The <link xlink:href="https://dino.im">Dino</link> XMPP client
+          was updated to 0.3, adding support for audio and video calls.
+        </para>
+      </listitem>
       <listitem>
         <para>
           <literal>services.mattermost.plugins</literal> has been added
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 4f8b098958c2..92968ef86fb3 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -294,6 +294,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 - A new module was added for the [Starship](https://starship.rs/) shell prompt,
   providing the options `programs.starship.enable` and `programs.starship.settings`.
 
+- The [Dino](https://dino.im) XMPP client was updated to 0.3, adding support for audio and video calls.
+
 - `services.mattermost.plugins` has been added to allow the declarative installation of Mattermost plugins.
   Plugins are automatically repackaged using autoPatchelf.