Move libjade dependency into nix
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -1,3 +0,0 @@
|
||||
[submodule "libjade"]
|
||||
path = libjade
|
||||
url = https://github.com/formosa-crypto/libjade.git
|
||||
2
Makefile
2
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
|
||||
|
||||
10
default.nix
10
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/";
|
||||
}
|
||||
|
||||
1
libjade
1
libjade
Submodule libjade deleted from b094006824
Reference in New Issue
Block a user