summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomberek <tomberek@users.noreply.github.com>2021-06-07 01:08:30 -0400
committerGitHub <noreply@github.com>2021-06-07 01:08:30 -0400
commit3a745b2c2c8c9c25878b39f31b009f38007c518d (patch)
tree494a915503d43371408d884a99d58dd49a090baa
parent08ae415432c8ee371153dbae54fc54698641388c (diff)
parent642dce498a97289417a085b4b2e58b9d76a2e30c (diff)
Merge pull request #125942 from musfay/rlottie
rlottie: 0.1 -> 0.2
-rw-r--r--lib/licenses.nix5
-rw-r--r--pkgs/development/libraries/rlottie/default.nix6
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 9baaba022bf5..3c4323e3d960 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -346,6 +346,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
fullName = "Unspecified free software license";
};
+ ftl = spdx {
+ spdxId = "FTL";
+ fullName = "Freetype Project License";
+ };
+
g4sl = {
fullName = "Geant4 Software License";
url = "https://geant4.web.cern.ch/geant4/license/LICENSE.html";
diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix
index a8cd88cae507..f1d3ffd02124 100644
--- a/pkgs/development/libraries/rlottie/default.nix
+++ b/pkgs/development/libraries/rlottie/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rlottie";
- version = "0.1";
+ version = "0.2";
src = fetchFromGitHub {
owner = "Samsung";
repo = pname;
rev = "v${version}";
- hash = "sha256-8KQ0ZnVg5rTb44IYnn02WBSe2SA5UGUOSLEdmmscUDs=";
+ sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3";
};
nativeBuildInputs = [ meson ninja pkg-config ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/Samsung/rlottie";
description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime";
- license = licenses.unfree; # Mixed, see https://github.com/Samsung/rlottie/blob/master/COPYING
+ license = with licenses; [ mit bsd3 mpl11 ftl ];
platforms = platforms.all;
maintainers = with maintainers; [ CRTified ];
};