diff --git a/pkgs/applications/blockchains/monero-gui/move-log-file.patch b/pkgs/by-name/mo/monero-gui/move-log-file.patch similarity index 100% rename from pkgs/applications/blockchains/monero-gui/move-log-file.patch rename to pkgs/by-name/mo/monero-gui/move-log-file.patch diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/by-name/mo/monero-gui/package.nix similarity index 87% rename from pkgs/applications/blockchains/monero-gui/default.nix rename to pkgs/by-name/mo/monero-gui/package.nix index 0b2df56aa999..d1683b09a684 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/by-name/mo/monero-gui/package.nix @@ -10,21 +10,12 @@ miniupnpc, monero-cli, pkg-config, - qtbase, - qtdeclarative, - qtgraphicaleffects, - qtmacextras, - qtmultimedia, - qtquickcontrols, - qtquickcontrols2, - qttools, - qtxmlpatterns, + qt5, quirc, randomx, rapidjson, stdenv, unbound, - wrapQtAppsHook, zeromq, trezorSupport ? true, @@ -49,8 +40,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook - (lib.getDev qttools) + qt5.wrapQtAppsHook + (lib.getDev qt5.qttools) ]; buildInputs = @@ -60,20 +51,20 @@ stdenv.mkDerivation rec { libgpg-error libsodium miniupnpc - qtbase - qtdeclarative - qtgraphicaleffects - qtmultimedia - qtquickcontrols - qtquickcontrols2 - qtxmlpatterns + qt5.qtbase + qt5.qtdeclarative + qt5.qtgraphicaleffects + qt5.qtmultimedia + qt5.qtquickcontrols + qt5.qtquickcontrols2 + qt5.qtxmlpatterns quirc randomx rapidjson unbound zeromq ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ qt5.qtmacextras ] ++ lib.optionals trezorSupport [ hidapi libusb1 diff --git a/pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch b/pkgs/by-name/mo/monero-gui/use-system-libquirc.patch similarity index 100% rename from pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch rename to pkgs/by-name/mo/monero-gui/use-system-libquirc.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6215f373cde0..e85982fcc56f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14846,8 +14846,6 @@ with pkgs; ledger-agent = with python3Packages; toPythonApplication ledger-agent; - monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { }; - napari = with python3Packages; toPythonApplication napari; nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };