git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #125942 from musfay/rlottie

rlottie: 0.1 -> 0.2

commit3a745b2c2c8c9c25878b39f31b009f38007c518d authortomberek <tomberek@users.noreply.github.com> dateMon 7 Jun 2021, 01:08 (5 years ago) parent08ae415642dce4
2 files changed+8−3
lib/licenses.nix+5 pkgs/development/libraries/rlottie/default.nix+3−3
lib/licenses.nix+5
@@ -346,6 +346,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
346346 fullName = "Unspecified free software license";
347347 };
348348
349+ ftl = spdx {
350+ spdxId = "FTL";
351+ fullName = "Freetype Project License";
352+ };
353+
349354 g4sl = {
350355 fullName = "Geant4 Software License";
351356 url = "https://geant4.web.cern.ch/geant4/license/LICENSE.html";
pkgs/development/libraries/rlottie/default.nix+3−3
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "rlottie";
5− version = "0.1";
5+ version = "0.2";
66
77 src = fetchFromGitHub {
88 owner = "Samsung";
99 repo = pname;
1010 rev = "v${version}";
11− hash = "sha256-8KQ0ZnVg5rTb44IYnn02WBSe2SA5UGUOSLEdmmscUDs=";
11+ sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3";
1212 };
1313
1414 nativeBuildInputs = [ meson ninja pkg-config ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 meta = with lib; {
1717 homepage = "https://github.com/Samsung/rlottie";
1818 description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime";
19− license = licenses.unfree; # Mixed, see https://github.com/Samsung/rlottie/blob/master/COPYING
19+ license = with licenses; [ mit bsd3 mpl11 ftl ];
2020 platforms = platforms.all;
2121 maintainers = with maintainers; [ CRTified ];
2222 };