summary refs log tree commit diff
diff options
context:
space:
mode:
authorarcnmx <git@git.arcn.mx>2023-10-27 17:24:20 -0700
committerarcnmx <git@git.arcn.mx>2023-10-28 11:21:57 -0700
commit0711d3d69bcce0f7f94aeb740716bf9d6bcab507 (patch)
tree955913837e1fd554b7e3038446adabb611d635f2
parent3406cbc61b8441dd14a3f115e2af96288a932f7c (diff)
downloadnixpkgs-0711d3d69bcce0f7f94aeb740716bf9d6bcab507.tar
nixpkgs-0711d3d69bcce0f7f94aeb740716bf9d6bcab507.tar.gz
nixpkgs-0711d3d69bcce0f7f94aeb740716bf9d6bcab507.tar.bz2
nixpkgs-0711d3d69bcce0f7f94aeb740716bf9d6bcab507.tar.lz
nixpkgs-0711d3d69bcce0f7f94aeb740716bf9d6bcab507.tar.xz
nixpkgs-0711d3d69bcce0f7f94aeb740716bf9d6bcab507.tar.zst
nixpkgs-0711d3d69bcce0f7f94aeb740716bf9d6bcab507.zip
xmrig: add meta.mainProgram
See #246386
-rw-r--r--nixos/modules/services/misc/xmrig.nix4
-rw-r--r--pkgs/applications/misc/xmrig/default.nix1
-rw-r--r--pkgs/applications/misc/xmrig/moneroocean.nix1
3 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/xmrig.nix b/nixos/modules/services/misc/xmrig.nix
index 05e63c77320..f75b47ffece 100644
--- a/nixos/modules/services/misc/xmrig.nix
+++ b/nixos/modules/services/misc/xmrig.nix
@@ -59,8 +59,8 @@ with lib;
       after = [ "network.target" ];
       description = "XMRig Mining Software Service";
       serviceConfig = {
-        ExecStartPre = "${cfg.package}/bin/xmrig --config=${configFile} --dry-run";
-        ExecStart = "${cfg.package}/bin/xmrig --config=${configFile}";
+        ExecStartPre = "${lib.getExe cfg.package} --config=${configFile} --dry-run";
+        ExecStart = "${lib.getExe cfg.package} --config=${configFile}";
         # https://xmrig.com/docs/miner/randomx-optimization-guide/msr
         # If you use recent XMRig with root privileges (Linux) or admin
         # privileges (Windows) the miner configure all MSR registers
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 2a6ac97c9c3..d93108bdf58 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
     description = "Monero (XMR) CPU miner";
     homepage = "https://github.com/xmrig/xmrig";
     license = licenses.gpl3Plus;
+    mainProgram = "xmrig";
     platforms = platforms.unix;
     maintainers = with maintainers; [ kim0 ];
   };
diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix
index 99d8225f264..ba643eb77b4 100644
--- a/pkgs/applications/misc/xmrig/moneroocean.nix
+++ b/pkgs/applications/misc/xmrig/moneroocean.nix
@@ -15,6 +15,7 @@ xmrig.overrideAttrs (oldAttrs: rec {
     description = "A fork of the XMRig CPU miner with support for algorithm switching";
     homepage = "https://github.com/MoneroOcean/xmrig";
     license = licenses.gpl3Plus;
+    mainProgram = "xmrig";
     platforms = platforms.unix;
     maintainers = with maintainers; [ j0hax ];
   };