Skip to content
This repository has been archived by the owner on Feb 17, 2025. It is now read-only.

Commit

Permalink
Restore github type for crypto3 dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
akokoshn committed Aug 28, 2024
1 parent 3230e80 commit f09bccd
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 21 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ include(GNUInstallDirs)
option(BUILD_DOCS "Build documentation" FALSE)
option(ENABLE_TESTS "Enable tests" FALSE)

if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
set(CMAKE_CXX_FLAGS "-ggdb -O0")
endif()

add_subdirectory(libs)
add_subdirectory(bin)
Expand Down
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
};
};
nil-crypto3 = {
url = "https://github.com/NilFoundation/crypto3";
type = "git";
type = "github";
owner = "NilFoundation";
repo = "crypto3";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
Expand Down Expand Up @@ -94,10 +95,6 @@
type = "app";
program = "${packages.default}/bin/assigner";
};
block_gen = {
type = "app";
program = "${packages.default}/bin/block_gen";
};
};
}));
}
Expand Down
9 changes: 3 additions & 6 deletions zkevm-framework.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,21 @@ in stdenv.mkDerivation rec {

cmakeFlags =
[
(if runTests then "-DBUILD_TESTS=TRUE" else "")
(if runTests then "-DCMAKE_ENABLE_TESTS=TRUE" else "")
(if runTests then "-DENABLE_TESTS=TRUE" else "")
(if enableDebug then "-DCMAKE_BUILD_TYPE=Debug" else "-DCMAKE_BUILD_TYPE=Release")
(if enableDebug then "-DCMAKE_CXX_FLAGS=-ggdb" else "")
(if enableDebug then "-DCMAKE_CXX_FLAGS=-O0" else "")
"-G Ninja"
];

doBuild = true;
doCheck = runTests;

checkPhase = ''
ninja executables_tests && ctest
ctest
ninja executables_tests
'';

shellHook = ''
PS1="\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ "
echo "Welcome to zkEVM framework development environment!"
echo "zkEVM-framework ${if enableDebug then "debug" else "release"} dev environment activated"
'';
}

0 comments on commit f09bccd

Please sign in to comment.