more flags fixing, remove some obsolete deps

nix/pkgs/default.nix

@@ -16,7 +16,7 @@ let
   urcrypt = import ./urcrypt {
     inherit libaes_siv;
     inherit (pkgs) stdenv pkgconfig openssl gmp;
-    inherit (deps) ed25519 argon2 secp256k1;
+    inherit (deps) scrypt secp256k1;
   };
 
   mkUrbit = { debug }:

nix/pkgs/urcrypt/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, openssl, gmp, secp256k1, argon2, scrypt, libaes_siv }:
+{ stdenv, pkgconfig, openssl, gmp, secp256k1, scrypt, libaes_siv }:
 
 stdenv.mkDerivation rec {
   name    = "urcrypt";
@@ -6,6 +6,6 @@ stdenv.mkDerivation rec {
   src     = ../../../pkg/urcrypt;
 
   buildInputs = [
-    pkgconfig openssl gmp secp256k1 argon2 scrypt libaes_siv
+    pkgconfig openssl gmp secp256k1 scrypt libaes_siv
   ];
 }

nix/pkgs/urcrypt/shell.nix

@@ -7,5 +7,5 @@ import ./default.nix {
   inherit (pkgs)
     stdenv openssl gmp pkgconfig;
   inherit (deps)
-    libaes_siv argon2 scrypt secp256k1;
+    libaes_siv scrypt secp256k1;
 }

pkg/urcrypt/.gitignore

@@ -1,4 +1,6 @@
 build-aux
+libtool
+stamp-h1
 Makefile
 Makefile.in
 aclocal.m4
@@ -8,4 +10,8 @@ config.status
 config.log
 configure
 .deps
+.libs
 .dirstamp
+*.lo
+*.o
+*.la

pkg/urcrypt/Makefile.am

@@ -12,13 +12,17 @@ noinst_HEADERS = ed25519/src/ed25519.h \
 								 ed25519/src/ge.h \
 								 ge-additions/ge-additions.h \
 								 argon2/include/argon2.h
+								 argon2/src/blake.h
 
-liburcrypt_la_CPPFLAGS = -Ied25519/src -Ige-additions
-liburcrypt_la_CFLAGS = $(SECP256K1_CFLAGS)
+liburcrypt_la_CPPFLAGS = -Ied25519/src \
+												 -Ige-additions \
+												 -Iargon2/include \
+												 -Iargon2/src/blake2
 liburcrypt_la_LIBADD = $(SECP256K1_LIBS) \
 											 libed25519.la \
 											 libge_additions.la \
 											 libargon2.la
+liburcrypt_la_CFLAGS = $(SECP256K1_CFLAGS)
 liburcrypt_la_SOURCES = urcrypt.c
 
 libed25519_la_SOURCES = ed25519/src/fixedint.h \
@@ -40,9 +44,8 @@ libge_additions_la_CPPFLAGS = -Ied25519/src
 libge_additions_la_CFLAGS = -Werror -pedantic -std=gnu99
 libge_additions_la_SOURCES = ge-additions/ge-additions.c
 
-libargon2_la_CPPFLAGS = -DARGON2_NO_THREADS \
-												-Wno-unused-value \
-												-Wno-unused-function
+libargon2_la_CPPFLAGS = -Iargon2/include -DARGON2_NO_THREADS 
+libargon2_la_CFLAGS = -Wno-unused-value -Wno-unused-function
 libargon2_la_SOURCES = argon2/src/core.h \
 											 argon2/src/blake2/blake2.h \
 											 argon2/src/thread.h \