diff options
author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2021-11-28 16:54:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-28 16:54:21 +0100 |
commit | af63e81ad9cc8326d235ee9bd555b1357d8b761d (patch) | |
tree | 09f405be744391b1b80ed693c4dcc137b09ddcac /pkgs/applications/blockchains | |
parent | 5ce7574ce8555bb39d2362e10d063359b92b75ec (diff) | |
parent | 97a3b2af1dc0a781f6a5886b536628d374c65c4b (diff) |
Merge pull request #147683 from rnhmjoj/pr-monero-cli
monero: rename to monero-cli
Diffstat (limited to 'pkgs/applications/blockchains')
-rw-r--r-- | pkgs/applications/blockchains/monero-cli/default.nix (renamed from pkgs/applications/blockchains/monero/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/applications/blockchains/monero-cli/use-system-libraries.patch (renamed from pkgs/applications/blockchains/monero/use-system-libraries.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/monero-gui/default.nix | 8 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index ad07c3eba0b93..975253741b09c 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - pname = "monero"; + pname = "monero-cli"; version = "0.17.2.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/monero/use-system-libraries.patch b/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch index 57e2a2e9a6960..57e2a2e9a6960 100644 --- a/pkgs/applications/blockchains/monero/use-system-libraries.patch +++ b/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 303cc6c54c5b9..af273fe9030bf 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -5,7 +5,7 @@ , qtmultimedia, qtxmlpatterns , qtquickcontrols, qtquickcontrols2 , qtmacextras -, monero, miniupnpc, unbound, readline +, monero-cli, miniupnpc, unbound, readline , boost, libunwind, libsodium, pcsclite , randomx, zeromq, libgcrypt, libgpg-error , hidapi, rapidjson, quirc @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtquickcontrols2 qtxmlpatterns - monero miniupnpc unbound readline + monero-cli miniupnpc unbound readline randomx libgcrypt libgpg-error boost libunwind libsodium pcsclite zeromq hidapi rapidjson quirc @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { postUnpack = '' # copy monero sources here # (needs to be writable) - cp -r ${monero.source}/* source/monero + cp -r ${monero-cli.source}/* source/monero chmod -R +w source/monero ''; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { # use monerod from the monero package substituteInPlace src/daemon/DaemonManager.cpp \ - --replace 'QApplication::applicationDirPath() + "' '"${monero}/bin' + --replace 'QApplication::applicationDirPath() + "' '"${monero-cli}/bin' # 1: only build external deps, *not* the full monero # 2: use nixpkgs libraries |