From 5fcac98de09f77b4bb29cebd984229b227b4a9bc Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Mon, 2 Sep 2024 15:49:02 +0200 Subject: [PATCH] implement evm-assigner flake --- crypto3/crypto3.nix | 2 -- evm-assigner/evm-assigner.nix | 3 +-- flake.nix | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/crypto3/crypto3.nix b/crypto3/crypto3.nix index b54c36c943..ea2394e694 100644 --- a/crypto3/crypto3.nix +++ b/crypto3/crypto3.nix @@ -19,8 +19,6 @@ in stdenv.mkDerivation { src = lib.sourceByRegex ./. [ ".*" ]; - #src = src_repo; - nativeBuildInputs = [ cmake ninja pkg-config ] ++ (lib.optional (!stdenv.isDarwin) gdb); # enableDebugging will keep debug symbols in boost diff --git a/evm-assigner/evm-assigner.nix b/evm-assigner/evm-assigner.nix index c9d71c92e4..9405a38005 100644 --- a/evm-assigner/evm-assigner.nix +++ b/evm-assigner/evm-assigner.nix @@ -1,6 +1,5 @@ { lib, stdenv, - src_repo, ninja, pkg-config, cmake, @@ -21,7 +20,7 @@ let in stdenv.mkDerivation rec { name = "evm-assigner"; - src = src_repo; + src = lib.sourceByRegex ./. [ ".*" ]; nativeBuildInputs = [ cmake ninja pkg-config ] ++ (lib.optional (!stdenv.isDarwin) gdb); diff --git a/flake.nix b/flake.nix index b47463c461..4bdabf798f 100644 --- a/flake.nix +++ b/flake.nix @@ -23,9 +23,9 @@ in { packages = rec { crypto3 = (pkgs.callPackage ./crypto3/crypto3.nix { }); - #parallel-crypto3 = (pkgs.callPackage ./parallel-crypto3/flake.nix { - # crypto3 = crypto3; - #}); + evm-assigner = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { + crypto3 = crypto3; + }); # The "all" package will build all packages. Convenient for CI, # so that "nix build" will check that all packages are correct.