diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-02-05 15:28:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-05 15:28:42 +0100 |
commit | f40412e3e2357bcd0a31c661da0c3974006439ff (patch) | |
tree | 2bcbe0538059df656dd9786d921454d3b81d812c | |
parent | cfa3f9bb996e4c871c8574fb5302512ed4485abc (diff) | |
parent | 31981d2cd9ae4eb3bf77e3fb904f0e8b45ea828d (diff) | |
download | nixpkgs-f40412e3e2357bcd0a31c661da0c3974006439ff.tar nixpkgs-f40412e3e2357bcd0a31c661da0c3974006439ff.tar.gz nixpkgs-f40412e3e2357bcd0a31c661da0c3974006439ff.tar.bz2 nixpkgs-f40412e3e2357bcd0a31c661da0c3974006439ff.tar.lz nixpkgs-f40412e3e2357bcd0a31c661da0c3974006439ff.tar.xz nixpkgs-f40412e3e2357bcd0a31c661da0c3974006439ff.tar.zst nixpkgs-f40412e3e2357bcd0a31c661da0c3974006439ff.zip |
Merge pull request #54380 from nh2/package-srt
SRT support for gstreamer
-rw-r--r-- | pkgs/development/libraries/gstreamer/bad/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/srt/default.nix | 34 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 38 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 5d9c03b1919..8179806859c 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -9,6 +9,7 @@ , libwebp, xvidcore, gnutls, mjpegtools , libGLU_combined, libintl, libgme , openssl, x265, libxml2 +, srt }: assert faacSupport -> faac != null; @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { libwebp xvidcore gnutls libGLU_combined libgme openssl x265 libxml2 libintl + srt ] ++ optional faacSupport faac ++ optional stdenv.isLinux wayland diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix new file mode 100644 index 00000000000..b1882ff030b --- /dev/null +++ b/pkgs/development/libraries/srt/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, openssl +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "srt"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "Haivision"; + repo = "srt"; + rev = "v${version}"; + sha256 = "0cv73j9c8024p6pg16c4hiryiv4jpgrfj2xhfdaprsikmkdnygmz"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl ]; + + cmakeFlags = [ + # TODO Remove this when https://github.com/Haivision/srt/issues/538 is fixed and available to nixpkgs + # Workaround for the fact that srt incorrectly disables GNUInstallDirs when LIBDIR is specified, + # see https://github.com/NixOS/nixpkgs/pull/54463#discussion_r249878330 + "-UCMAKE_INSTALL_LIBDIR" + ]; + + meta = { + description = "Secure, Reliable, Transport"; + homepage = https://www.srtalliance.org; + license = licenses.mpl20; + maintainers = with maintainers; [ nh2 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bfb7c71b54..bdd54e2ea9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12615,6 +12615,8 @@ in srm = callPackage ../tools/security/srm { }; + srt = callPackage ../development/libraries/srt { }; + srtp = callPackage ../development/libraries/srtp { libpcap = if stdenv.isLinux then libpcap else null; }; |