Skip to content

Commit

Permalink
Zk and zk-marshalling updated #177
Browse files Browse the repository at this point in the history
  • Loading branch information
ETatuzova committed Apr 26, 2024
1 parent 87ec9f8 commit e93741e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
9 changes: 2 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@
nativeBuildInputs = with pkgs; [
cmake
ninja
pkg-config
];

propagatedBuildInputs = with pkgs; [
boost183
pkg-config
];

# If we put BUILD_TESTS in cmakeFlags, tests would be built with install target. Without it they wouldn't be built at all.
Expand Down Expand Up @@ -139,12 +136,10 @@
(makeCrypto3Derivation { inherit system; }).overrideAttrs (oldAttrs: {
name = "Crypto3-${name}-tests";

nativeBuildInputs = oldAttrs.nativeBuildInputs ++ oldAttrs.propagatedBuildInputs ++ [
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [
(if compiler == "gcc" then pkgs.gcc else pkgs.clang)
];

propagatedBuildInputs = [];

cmakeFlags = [
"-G Ninja"
"-DCMAKE_CXX_COMPILER=${if compiler == "gcc" then "g++" else "clang++"}"
Expand Down
2 changes: 1 addition & 1 deletion libs/marshalling/zk
Submodule zk updated 1 files
+124 −20 test/placeholder_proof.cpp

0 comments on commit e93741e

Please sign in to comment.