From 36ae72a8d90d94b5b0d1fd01adf50a33edd80e80 Mon Sep 17 00:00:00 2001
From: Aaron Kaiser <a_kaiser@posteo.de>
Date: Wed, 15 May 2024 09:00:57 +0200
Subject: [PATCH] Move libjade dependency into nix

---
 .gitmodules |  3 ---
 Makefile    |  2 +-
 default.nix | 10 ++++++++++
 libjade     |  1 -
 4 files changed, 11 insertions(+), 5 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 libjade

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 36a0230..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "libjade"]
-	path = libjade
-	url = https://github.com/formosa-crypto/libjade.git
diff --git a/Makefile b/Makefile
index 9f546a1..193f2b6 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ clean:
 	$(MAKE) -C syscall clean
 
 build/%.S: src/%.jazz
-	JASMINPATH="Jade=libjade/src/" $(JC) $< -o $@
+	$(JC) $< -o $@
 
 syscall/jasmin_syscall.o: syscall/jasmin_syscall.c syscall/jasmin_syscall.h
 	$(MAKE) -C syscall
diff --git a/default.nix b/default.nix
index bdd958b..05cf48a 100644
--- a/default.nix
+++ b/default.nix
@@ -16,6 +16,13 @@ let
       make -C compiler/
     '';
   };
+
+  libjade = fetchFromGitHub {
+    owner = "formosa-crypto";
+    repo = "libjade";
+    rev = "b0940068243f01dc3c185d166f1450936eec3eed";
+    hash = "sha256-w71QmJn5TG1cJ+SGXJyjh86uge177uRGSvwgnJXpKYg=";
+  };
 in
 stdenv.mkDerivation {
   name = "x25519-agent";
@@ -25,6 +32,7 @@ stdenv.mkDerivation {
     gnumake
     gcc
     jasmin
+    libjade
   ];
 
   configurePhase = ''
@@ -35,4 +43,6 @@ stdenv.mkDerivation {
     mkdir -p $out/lib
     cp build/libagent.a $out/lib
   '';
+
+  JASMINPATH = "Jade=${libjade}/src/";
 }
diff --git a/libjade b/libjade
deleted file mode 160000
index b094006..0000000
--- a/libjade
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0940068243f01dc3c185d166f1450936eec3eed