From 986e17a00236e7f7db5cde88642e31511ececa8d Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Fri, 1 Nov 2024 20:06:31 +0100 Subject: [PATCH] electron-cash: move to by-name --- .../default.nix => by-name/el/electron-cash/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{applications/misc/electron-cash/default.nix => by-name/el/electron-cash/package.nix} (96%) diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/by-name/el/electron-cash/package.nix similarity index 96% rename from pkgs/applications/misc/electron-cash/default.nix rename to pkgs/by-name/el/electron-cash/package.nix index fe8a63c1156d5..7707a6d93dbb8 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/by-name/el/electron-cash/package.nix @@ -3,9 +3,8 @@ stdenv, fetchFromGitHub, python3Packages, - wrapQtAppsHook, + qt5, secp256k1, - qtwayland, }: python3Packages.buildPythonApplication rec { @@ -56,9 +55,9 @@ python3Packages.buildPythonApplication rec { pysatochip ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; + buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isLinux qt5.qtwayland; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 364bf2acce85f..22d5167abc96a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28759,8 +28759,6 @@ with pkgs; oed = callPackage ../applications/editors/oed { }; - electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; - electrum = libsForQt5.callPackage ../applications/misc/electrum { }; electrum-grs = libsForQt5.callPackage ../applications/misc/electrum/grs.nix { };