diff --git a/pkgs/applications/misc/megasync/dont-fetch-clang-format.patch b/pkgs/by-name/me/megasync/dont-fetch-clang-format.patch similarity index 100% rename from pkgs/applications/misc/megasync/dont-fetch-clang-format.patch rename to pkgs/by-name/me/megasync/dont-fetch-clang-format.patch diff --git a/pkgs/applications/misc/megasync/megasync-fix-cmake-install-bindir.patch b/pkgs/by-name/me/megasync/megasync-fix-cmake-install-bindir.patch similarity index 100% rename from pkgs/applications/misc/megasync/megasync-fix-cmake-install-bindir.patch rename to pkgs/by-name/me/megasync/megasync-fix-cmake-install-bindir.patch diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/by-name/me/megasync/package.nix similarity index 90% rename from pkgs/applications/misc/megasync/default.nix rename to pkgs/by-name/me/megasync/package.nix index d04ef8ad66e7..a38f3421f5d8 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/by-name/me/megasync/package.nix @@ -16,17 +16,9 @@ libuv, libxcb, libzen, - mkDerivation, openssl, pkg-config, - qtbase, - qtdeclarative, - qtgraphicaleffects, - qttools, - qtquickcontrols, - qtquickcontrols2, - qtsvg, - qtx11extras, + libsForQt5, readline, sqlite, unzip, @@ -35,7 +27,7 @@ zlib, qt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "megasync"; version = "5.7.1.0"; @@ -63,8 +55,9 @@ mkDerivation rec { cmake libtool pkg-config - qttools + libsForQt5.qttools unzip + libsForQt5.wrapQtAppsHook ]; buildInputs = [ c-ares @@ -79,13 +72,13 @@ mkDerivation rec { libxcb libzen openssl - qtbase - qtdeclarative - qtgraphicaleffects - qtquickcontrols - qtquickcontrols2 - qtsvg - qtx11extras + libsForQt5.qtbase + libsForQt5.qtdeclarative + libsForQt5.qtgraphicaleffects + libsForQt5.qtquickcontrols + libsForQt5.qtquickcontrols2 + libsForQt5.qtsvg + libsForQt5.qtx11extras readline sqlite wget diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b1c49f932c3..365021f22862 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2445,8 +2445,6 @@ with pkgs; materialx = with python3Packages; toPythonApplication materialx; - megasync = libsForQt5.callPackage ../applications/misc/megasync { }; - # while building documentation meson may want to run binaries for host # which needs an emulator # example of an error which this fixes