Merge remote-tracking branch 'upstream/master' into staging

Conflicts:
	pkgs/top-level/all-packages.nix

2 files changed, 29 insertions, 0 deletions

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 97f775e8e584..67e765020915 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -13,6 +13,8 @@ rec {
 
   gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; };
 
+  gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base; };
+
   gst-libav = callPackage ./libav { inherit gst-plugins-base; };
 
   gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; };
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
new file mode 100644
index 000000000000..813135f270d3
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, gst-plugins-base }:
+
+stdenv.mkDerivation rec {
+  name = "gst-rtsp-server-1.12.3";
+
+  meta = with stdenv.lib; {
+    description = "Gstreamer RTSP server";
+    homepage    = "https://gstreamer.freedesktop.org";
+    longDescription = ''
+      a library on top of GStreamer for building an RTSP server.
+    '';
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ bkchr ];
+  };
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz";
+    sha256 = "1v3lghx75l05hssgwxdxsgrxpn10gxlgkfb6vq0rl0hnpdqmj9b7";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ gst-plugins-base ];
+}