From 2b8744a7f5259c175e07c8acaf5c7b07cb02d5e1 Mon Sep 17 00:00:00 2001 From: J08nY Date: Mon, 12 Aug 2024 20:17:22 +0200 Subject: Add version define to shim build. --- nix/boringsslshim.nix | 2 +- nix/botanshim.nix | 2 ++ nix/cryptoppshim.nix | 2 ++ nix/gcryptshim.nix | 2 ++ nix/ippcpshim.nix | 2 +- nix/libresslshim.nix | 2 ++ nix/mbedtlsshim.nix | 2 ++ nix/nettleshim.nix | 2 ++ nix/opensslshim.nix | 2 ++ 9 files changed, 16 insertions(+), 2 deletions(-) (limited to 'nix') diff --git a/nix/boringsslshim.nix b/nix/boringsslshim.nix index 715e721..a32a5bc 100644 --- a/nix/boringsslshim.nix +++ b/nix/boringsslshim.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { make boringssl ''; - BORINGSSL_CFLAGS = "-I${boringssl.dev.outPath}/include"; + BORINGSSL_CFLAGS = "-I${boringssl.dev.outPath}/include -DECTESTER_BORINGSSL_${boringssl.version}=1"; installPhase = '' mkdir --parents $out/lib diff --git a/nix/botanshim.nix b/nix/botanshim.nix index 8688b20..ce16b1b 100644 --- a/nix/botanshim.nix +++ b/nix/botanshim.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation { make botan ''; + BOTAN_CXXFLAGS = "-DECTESTER_BOTAN_${builtins.replaceStrings ["."] ["_"] botan2.version}=1"; + installPhase = '' mkdir --parents $out/lib cp botan_provider.so $out/lib/ diff --git a/nix/cryptoppshim.nix b/nix/cryptoppshim.nix index 8c735d7..f526275 100644 --- a/nix/cryptoppshim.nix +++ b/nix/cryptoppshim.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { make cryptopp ''; + CRYPTOPP_CXXFLAGS = "-DECTESTER_CRYPTOPP_${cryptopp.version}=1"; + installPhase = '' mkdir --parents $out/lib cp cryptopp_provider.so $out/lib/ diff --git a/nix/gcryptshim.nix b/nix/gcryptshim.nix index 764b03c..869bcd9 100644 --- a/nix/gcryptshim.nix +++ b/nix/gcryptshim.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation { make gcrypt ''; + LIBGCRYPT_CFLAGS = "-DECTESTER_LIBGCRYPT_${builtins.replaceStrings ["."] ["_"] libgcrypt.version}=1"; + installPhase = '' mkdir --parents $out/lib cp gcrypt_provider.so $out/lib/ diff --git a/nix/ippcpshim.nix b/nix/ippcpshim.nix index 349817b..a059d5b 100644 --- a/nix/ippcpshim.nix +++ b/nix/ippcpshim.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { jdk11_headless ]; - IPP_CRYPTO_CFLAGS = "-I${ipp-crypto.dev}/include"; + IPP_CRYPTO_CFLAGS = "-I${ipp-crypto.dev}/include -DECTESTER_IPPCP_VERSION=${ipp-crypto.version}"; IPP_CRYPTO_LFLAGS = "-L${ipp-crypto}/lib/"; buildPhase = '' diff --git a/nix/libresslshim.nix b/nix/libresslshim.nix index 9d23f4b..862701f 100644 --- a/nix/libresslshim.nix +++ b/nix/libresslshim.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { make libressl ''; + LIBRESSL_CFLAGS = "-DECTESTER_LIBRESSL_${builtins.replaceStrings ["."] ["_"] libressl.version}=1"; + installPhase = '' mkdir --parents $out/lib cp libressl_provider.so $out/lib diff --git a/nix/mbedtlsshim.nix b/nix/mbedtlsshim.nix index d1f5434..06abb0b 100644 --- a/nix/mbedtlsshim.nix +++ b/nix/mbedtlsshim.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { make mbedtls ''; + MBEDTLS_CFLAGS = "-DECTESTER_MBEDTLS_${builtins.replaceStrings ["."] ["_"] mbedtls.version}=1"; + installPhase = '' mkdir --parents $out/lib cp mbedtls_provider.so $out/lib diff --git a/nix/nettleshim.nix b/nix/nettleshim.nix index f968357..7488398 100644 --- a/nix/nettleshim.nix +++ b/nix/nettleshim.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { make nettle ''; + NETTLE_CFLAGS = "-DECTESTER_NETTLE_${builtins.replaceStrings ["."] ["_"] nettle.version}=1"; + installPhase = '' mkdir --parents $out/lib cp nettle_provider.so $out/lib diff --git a/nix/opensslshim.nix b/nix/opensslshim.nix index 1c79e94..be0263b 100644 --- a/nix/opensslshim.nix +++ b/nix/opensslshim.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { make openssl ''; + OPENSSL_CFLAGS = "-DECTESTER_OPENSSL_${builtins.replaceStrings ["."] ["_"] openssl.version}=1"; + installPhase = '' mkdir --parents $out/lib cp openssl_provider.so $out/lib/ -- cgit v1.2.3-70-g09d2