Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD

Conflicts:
	nixpkgs/pkgs/servers/pr-tracker/default.nix

1 files changed, 30 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libcaption/default.nix b/nixpkgs/pkgs/development/libraries/libcaption/default.nix
new file mode 100644
index 000000000000..78cf5214051d
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libcaption/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, re2c
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libcaption";
+  version = "0.7";
+
+  src = fetchFromGitHub {
+    owner = "szatmary";
+    repo = "libcaption";
+    rev = finalAttrs.version;
+    sha256 = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ re2c ];
+
+  meta = with lib; {
+    description = "Free open-source CEA608 / CEA708 closed-caption encoder/decoder";
+    homepage = "https://github.com/szatmary/libcaption";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ pschmitt ];
+  };
+})