From a9818e6187128971eca14d5dec12d1d23f0cae3f Mon Sep 17 00:00:00 2001 From: Martin Nikov Date: Thu, 18 Jul 2024 11:31:12 +0300 Subject: [PATCH] config(modules/erigon): Remove blst-portable as option --- modules/erigon/default.nix | 7 +------ modules/erigon/options.nix | 6 ------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/modules/erigon/default.nix b/modules/erigon/default.nix index 7d44dd21..347c551b 100644 --- a/modules/erigon/default.nix +++ b/modules/erigon/default.nix @@ -102,11 +102,6 @@ in { ${concatStringsSep " \\\n" filteredArgs} \ ${lib.escapeShellArgs cfg.extraArgs} ''; - - package = - if cfg.blst-portable - then pkgs.erigon-blst-portable - else cfg.package; in nameValuePair serviceName (mkIf cfg.enable { description = "Erigon Ethereum node (${erigonName})"; @@ -122,7 +117,7 @@ in { ExecStartPre = mkIf cfg.subVolume (mkBefore [ "+${scripts.setupSubVolume} /var/lib/private/${serviceName}" ]); - ExecStart = "${package}/bin/erigon ${scriptArgs}"; + ExecStart = "${cfg.package}/bin/erigon ${scriptArgs}"; } (mkIf (cfg.args.authrpc.jwtsecret != null) { LoadCredential = ["jwtsecret:${cfg.args.authrpc.jwtsecret}"]; diff --git a/modules/erigon/options.nix b/modules/erigon/options.nix index 9a76b768..ee5eb74d 100644 --- a/modules/erigon/options.nix +++ b/modules/erigon/options.nix @@ -19,12 +19,6 @@ default = []; }; - blst-portable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Make blst library used by erigon build in portable mode. When this option is enabled, the package option is ignored."; - }; - package = mkOption { type = types.package; default = pkgs.erigon;