From 68457546c32a1185a306544078e9f493fe8ac3b8 Mon Sep 17 00:00:00 2001 From: renesat Date: Thu, 8 Aug 2024 21:14:28 +0200 Subject: [PATCH 1/2] licenses: add FSL-1.1-Apache-2.0 --- lib/licenses.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 67744b499d8a..302a42e96521 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -547,6 +547,13 @@ lib.mapAttrs mkLicense ({ redistributable = true; }; + fsl11Asl20 = { + fullName = "Functional Source License, Version 1.1, Apache 2.0 Future License"; + url = "https://fsl.software/FSL-1.1-Apache-2.0.template.md"; + free = false; + redistributable = true; + }; + ftl = { spdxId = "FTL"; fullName = "Freetype Project License"; From cce070e794bfe637eb6409fc54ef37f0202e4425 Mon Sep 17 00:00:00 2001 From: renesat Date: Thu, 8 Aug 2024 21:23:17 +0200 Subject: [PATCH 2/2] _1fps: init at 0.1.10 --- pkgs/by-name/_1/_1fps/package.nix | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/_1/_1fps/package.nix diff --git a/pkgs/by-name/_1/_1fps/package.nix b/pkgs/by-name/_1/_1fps/package.nix new file mode 100644 index 000000000000..a8ec077491ce --- /dev/null +++ b/pkgs/by-name/_1/_1fps/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + xorg, +}: +buildGoModule rec { + pname = "1fps"; + version = "0.1.10"; + + src = fetchFromGitHub { + owner = "1fpsvideo"; + repo = "1fps"; + rev = "v${version}"; + hash = "sha256-3uPGFxEWmKQxQWPmotZI29GykUGQDjtDjFPps4QMs0M="; + }; + + proxyVendor = true; + + vendorHash = "sha256-J3RGQhjpGURmXOwq19BbbNg5ERrUXHnSG5Id6gX7Nug="; + + buildInputs = [ + xorg.libX11 + xorg.libXtst + xorg.libXi + ]; + + meta = { + description = "Encrypted Screen Sharing"; + homepage = "https://1fps.video"; + license = lib.licenses.fsl11Asl20; + maintainers = with lib.maintainers; [ renesat ]; + mainProgram = "1fps"; + }; +}