Unverified Commit 9efdfac8 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #142631 from Artturin/addqtlottie 

qt5.qtlottie: init at 5.15.2
parents ba5d6abb 0da1362f

pkgs/development/libraries/qt-5/5.14/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ let 
      qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};

      qtimageformats = callPackage ../modules/qtimageformats.nix {};

      qtlocation = callPackage ../modules/qtlocation.nix {};

      qtlottie = callPackage ../modules/qtlottie.nix {};

      qtmacextras = callPackage ../modules/qtmacextras.nix {};

      qtmultimedia = callPackage ../modules/qtmultimedia.nix {

        inherit gstreamer gst-plugins-base;
@@ -222,7 +223,7 @@ let 
        qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2

        qtscript qtsensors qtserialport qtsvg qttools qttranslations

        qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets

        qtwebview qtx11extras qtxmlpatterns

        qtwebview qtx11extras qtxmlpatterns qtlottie

      ] ++ lib.optional (!stdenv.isDarwin) qtwayland

        ++ lib.optional (stdenv.isDarwin) qtmacextras);

pkgs/development/libraries/qt-5/5.15/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ let 
      qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};

      qtimageformats = callPackage ../modules/qtimageformats.nix {};

      qtlocation = callPackage ../modules/qtlocation.nix {};

      qtlottie = callPackage ../modules/qtlottie.nix {};

      qtmacextras = callPackage ../modules/qtmacextras.nix {};

      qtmultimedia = callPackage ../modules/qtmultimedia.nix {

        inherit gstreamer gst-plugins-base;
@@ -180,7 +181,7 @@ let 
        qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2

        qtscript qtsensors qtserialport qtsvg qttools qttranslations

        qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets

        qtwebview qtx11extras qtxmlpatterns

        qtwebview qtx11extras qtxmlpatterns qtlottie

      ] ++ lib.optional (!stdenv.isDarwin) qtwayland

        ++ lib.optional (stdenv.isDarwin) qtmacextras);

pkgs/development/libraries/qt-5/modules/qtlottie.nix

0 → 100644
+9 −0
Original line number Diff line number Diff line 
{ qtModule

, qtbase

, qtdeclarative

}:



qtModule {

  pname = "qtlottie";

  qtInputs = [ qtbase qtdeclarative ];

}