build: normalize our use of pkg-config, rename urcrypt config

nix/pkgs/urcrypt/default.nix

@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs =
     [ autoreconfHook pkgconfig ];
 
-  buildInputs =
+  propagatedBuildInputs =
     [ openssl secp256k1 libaes_siv ];
 }

pkg/urbit/configure

@@ -6,7 +6,7 @@ URBIT_VERSION="$(cat ./version)"
 
 deps="                                           \
   curl gmp sigsegv ent h2o uv murmur3 softfloat3 \
-  liburcrypt-0 ssl crypto z lmdb pthread         \
+  urcrypt ssl crypto z lmdb pthread              \
 "
 
 headers="             \
@@ -171,8 +171,8 @@ fi
 
 for dep in ${osdeps-} $deps
 do
-   LDFLAGS="${LDFLAGS-} $($PKG_CONFIG --libs $dep 2>/dev/null || echo -l$dep)"
-   CFLAGS="${CFLAGS-} $($PKG_CONFIG --cflags $dep 2>/dev/null || true)"
+   LDFLAGS="${LDFLAGS-} $($PKG_CONFIG --libs "lib$dep" 2>/dev/null || echo -l$dep)"
+   CFLAGS="${CFLAGS-} $($PKG_CONFIG --cflags "lib$dep" 2>/dev/null || true)"
 done
 
 for header in $headers; do

pkg/urcrypt/Makefile.am

@@ -19,7 +19,7 @@ noinst_HEADERS = urcrypt/util.h \
 		 scrypt/libscrypt.h
 
 # main library
-pkgconfig_DATA = liburcrypt-$(URCRYPT_API_VERSION).pc
+pkgconfig_DATA = liburcrypt.pc
 DISTCLEANFILES = $(pkgconfig_DATA)
 
 liburcrypt_la_CPPFLAGS = -I$(srcdir)/ed25519/src \

pkg/urcrypt/configure.ac

@@ -102,5 +102,5 @@ AC_TYPE_UINT8_T
 AC_CHECK_FUNCS([memset])
 
 # Finish and output
-AC_CONFIG_FILES([Makefile liburcrypt-$URCRYPT_API_VERSION.pc:liburcrypt.pc.in])
+AC_CONFIG_FILES([Makefile liburcrypt.pc:liburcrypt.pc.in])
 AC_OUTPUT