From a0d8cadcbb6cfbcaf7701cb867628982c58f545d Mon Sep 17 00:00:00 2001
From: Aaryamann Challani <43716372+rymnc@users.noreply.github.com>
Date: Wed, 5 Oct 2022 11:50:24 +0530
Subject: [PATCH] chore(Makefile): Make zerokit the default RLN implementation
 (#1190)

* chore(ci): add zerokit test

* fix(ci): typo

* fix(Makefile): RLN points to zerokit, RLNKILIC points to kilic impl

* fix(ci): remove zerokit test workflow now that zerokit is default

* fix(Makefile): zerokit in ci

* fix(Makefile): do not compile kilic by default

* test(nix): add llvm to nix shell

* test(nix): clang

* fix(nix): mkShell

* fix(nix): mkShell

* fix(nix): err

* fix(nix): add binutils to macos nix shell

* fix(nix): test with musl-tools

* fix(nix): remove musl-tools

* fix(nix): add Security module

* fix(nix): gcc for linux, clang for macos

* test(Makefile): set CC to env

* Revert "test(Makefile): set CC to env"

This reverts commit fdab95f2cd0bdef916744d793ebf7005dd1d4396.

* test(nimbus-build-system): bad gcc

* fix(nix): remove optional for linux

* Revert "test(nimbus-build-system): bad gcc"

This reverts commit c6b81f81320281765f6b0eb231a15adf28279ef0.

* fix(nix): semicolon

Co-authored-by: G <28568419+s1fr0@users.noreply.github.com>
---
 Makefile  | 29 +++++++++++++----------------
 shell.nix |  5 ++++-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 77109f9e1..e62625527 100644
--- a/Makefile
+++ b/Makefile
@@ -70,17 +70,13 @@ endif
 
 # control rln code compilation
 ifeq ($(RLN), true)
-NIM_PARAMS := $(NIM_PARAMS) -d:rln
-else  ifeq ($(CI), true)
-NIM_PARAMS := $(NIM_PARAMS) -d:rln 
+NIM_PARAMS := $(NIM_PARAMS) -d:rlnzerokit
+else ifeq ($(CI), true)
+NIM_PARAMS := $(NIM_PARAMS) -d:rlnzerokit 
 endif
 
-# control rln code compilation
-ifeq ($(RLNZEROKIT), true)
-NIM_PARAMS := $(NIM_PARAMS) -d:rlnzerokit
-#To avoid redefinition conflicts, we disable rln zerokit default compilation in CI
-#else ifeq ($(CI), true)
-#NIM_PARAMS := $(NIM_PARAMS) -d:rlnzerokit 
+ifeq ($(RLNKILIC), true)
+NIM_PARAMS := $(NIM_PARAMS) -d:rln
 endif
 
 # detecting the os
@@ -175,19 +171,20 @@ endif
 endif
 
 rlnlib:
-ifeq ($(RLN), true)
-	cargo build --manifest-path vendor/rln/Cargo.toml
-else  ifeq ($(CI), true)
+ifeq ($(RLNKILIC), true)
 	cargo build --manifest-path vendor/rln/Cargo.toml
+# Avoid compiling the non-default implementation of RLN in CI
+# else  ifeq ($(CI), true)
+# 	cargo build --manifest-path vendor/rln/Cargo.toml
 endif
 
 
 rlnzerokitlib:
-ifeq ($(RLNZEROKIT), true)
+ifeq ($(RLN), true)
+	cargo build --manifest-path vendor/zerokit/rln/Cargo.toml --release
+# Enable zerokit rln in CI
+else  ifeq ($(CI), true)
 	cargo build --manifest-path vendor/zerokit/rln/Cargo.toml --release
-#To avoid redefinition conflicts, we disable rln zerokit default compilation in CI
-#else  ifeq ($(CI), true)
-#	cargo build --manifest-path vendor/zerokit/rln/Cargo.toml --release
 endif
 
 test2: | build deps installganache
diff --git a/shell.nix b/shell.nix
index 1b76081fb..b1cb18281 100644
--- a/shell.nix
+++ b/shell.nix
@@ -11,5 +11,8 @@ pkgs.mkShell {
     git   # 2.37.3
     which # 2.21
     rustc # 1.63.0
-  ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
+  ] ++ lib.optionals stdenv.isDarwin [ 
+    libiconv
+    darwin.apple_sdk.frameworks.Security
+  ];
 }