Merge pull request #125942 from musfay/rlottie

rlottie: 0.1 -> 0.2

authored by tomberek and committed by GitHub 3a745b2c 08ae4154

+8 -3
+5
lib/licenses.nix
··· 346 fullName = "Unspecified free software license"; 347 }; 348 349 g4sl = { 350 fullName = "Geant4 Software License"; 351 url = "https://geant4.web.cern.ch/geant4/license/LICENSE.html";
··· 346 fullName = "Unspecified free software license"; 347 }; 348 349 + ftl = spdx { 350 + spdxId = "FTL"; 351 + fullName = "Freetype Project License"; 352 + }; 353 + 354 g4sl = { 355 fullName = "Geant4 Software License"; 356 url = "https://geant4.web.cern.ch/geant4/license/LICENSE.html";
+3 -3
pkgs/development/libraries/rlottie/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "rlottie"; 5 - version = "0.1"; 6 7 src = fetchFromGitHub { 8 owner = "Samsung"; 9 repo = pname; 10 rev = "v${version}"; 11 - hash = "sha256-8KQ0ZnVg5rTb44IYnn02WBSe2SA5UGUOSLEdmmscUDs="; 12 }; 13 14 nativeBuildInputs = [ meson ninja pkg-config ]; ··· 16 meta = with lib; { 17 homepage = "https://github.com/Samsung/rlottie"; 18 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 20 platforms = platforms.all; 21 maintainers = with maintainers; [ CRTified ]; 22 };
··· 2 3 stdenv.mkDerivation rec { 4 pname = "rlottie"; 5 + version = "0.2"; 6 7 src = fetchFromGitHub { 8 owner = "Samsung"; 9 repo = pname; 10 rev = "v${version}"; 11 + sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3"; 12 }; 13 14 nativeBuildInputs = [ meson ninja pkg-config ]; ··· 16 meta = with lib; { 17 homepage = "https://github.com/Samsung/rlottie"; 18 description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime"; 19 + license = with licenses; [ mit bsd3 mpl11 ftl ]; 20 platforms = platforms.all; 21 maintainers = with maintainers; [ CRTified ]; 22 };