about summary refs log tree commit diff
path: root/pkgs/applications/networking
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2024-02-05 16:29:08 +0200
committerGitHub <noreply@github.com>2024-02-05 16:29:08 +0200
commit5f92ce4ba4afcf4b40fb011c9b81dc39d8c6bbca (patch)
treeb31fc8bc075afb3c997b6e2a598b77046aaaaa0f /pkgs/applications/networking
parent6455d845dc357ccd24f8493b087a50fb6df8244f (diff)
parent1613836e188f74b9b5393b588f4b46b520bf51c6 (diff)
downloadnixlib-5f92ce4ba4afcf4b40fb011c9b81dc39d8c6bbca.tar
nixlib-5f92ce4ba4afcf4b40fb011c9b81dc39d8c6bbca.tar.gz
nixlib-5f92ce4ba4afcf4b40fb011c9b81dc39d8c6bbca.tar.bz2
nixlib-5f92ce4ba4afcf4b40fb011c9b81dc39d8c6bbca.tar.lz
nixlib-5f92ce4ba4afcf4b40fb011c9b81dc39d8c6bbca.tar.xz
nixlib-5f92ce4ba4afcf4b40fb011c9b81dc39d8c6bbca.tar.zst
nixlib-5f92ce4ba4afcf4b40fb011c9b81dc39d8c6bbca.zip
Merge pull request #285395 from kevincox/gnome-network-displays-0.92.1
gnome-network-displays: 0.90.5 → 0.92.1
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r--pkgs/applications/networking/gnome-network-displays/default.nix30
1 files changed, 26 insertions, 4 deletions
diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix
index 392f98c4fb6c..d61eff36081b 100644
--- a/pkgs/applications/networking/gnome-network-displays/default.nix
+++ b/pkgs/applications/networking/gnome-network-displays/default.nix
@@ -13,20 +13,26 @@
 # Not native
 , gst_all_1
 , gsettings-desktop-schemas
-, gtk3
+, gtk4
+, avahi
 , glib
 , networkmanager
+, json-glib
+, libadwaita
+, libportal-gtk4
 , libpulseaudio
+, libsoup_3
 , pipewire
+, protobufc
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-network-displays";
-  version = "0.90.5";
+  version = "0.92.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-2SBVQK4fJeK8Y2UrrL0g5vQIerDdGE1nhFc6ke4oIpI=";
+    sha256 = "sha256-aoH9SpD7AfM6c6moMCCuQ1igkcrKgqAf1iLlpuXtaic=";
   };
 
   nativeBuildInputs = [
@@ -41,7 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    gtk3
+    avahi
+    gtk4
     glib
     gsettings-desktop-schemas
     gst_all_1.gstreamer
@@ -53,9 +60,24 @@ stdenv.mkDerivation (finalAttrs: {
     gst_all_1.gst-vaapi
     pipewire
     networkmanager
+    json-glib
+    libadwaita
+    libportal-gtk4
     libpulseaudio
+    libsoup_3
+    protobufc
   ];
 
+  /* Without this flag, we get this include error:
+
+  /nix/store/...-gst-rtsp-server-1.22.8-dev/include/gstreamer-1.0/gst/rtsp-server/rtsp-media-factory.h:21:10: fatal error: gst/rtsp/gstrtspurl.h: No such file or directory
+  21 | #include <gst/rtsp/gstrtspurl.h>
+
+  Hence, this is not necessarily an upstream issue, but could be something
+  wrong with how our gst_all_1 depend on each other.
+  */
+  CFLAGS = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
+
   preConfigure = ''
     patchShebangs ./build-aux/meson/postinstall.py
   '';