Skip to content

Commit 5d991ae

Browse files
J08nYJ08nY
committed
Unify shim nix files and add versions to them.
1 parent 2a9e594 commit 5d991ae

11 files changed

+63
-33
lines changed

‎nix/boringsslshim.nix

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
{ pkgs, boringssl }:
22
with pkgs;
33
stdenv.mkDerivation {
4-
name = "BoringSSLShim";
4+
name = "BoringSSLShim-${boringssl.version}";
55
src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni;
66

77
buildInputs = [
88
boringssl
99
pkg-config
10-
jdk
10+
pkgs.jdk_headless
1111
];
1212

1313
buildPhase = ''
1414
make boringssl
1515
'';
1616

17-
BORINGSSL_CFLAGS = "-I${boringssl.dev.outPath}/include -DECTESTER_BORINGSSL_${boringssl.version}=1";
17+
BORINGSSL_CFLAGS = ''
18+
-I${boringssl.dev.outPath}/include \
19+
-DECTESTER_BORINGSSL_${boringssl.version}=1 \
20+
'';
1821

1922
installPhase = ''
2023
mkdir --parents $out/lib

‎nix/botanshim.nix

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
{
2-
stdenv,
3-
botan2,
4-
pkg-config,
5-
jdk,
2+
pkgs,
3+
botan2
64
}:
5+
with pkgs;
76
stdenv.mkDerivation {
8-
name = "BotanShim";
7+
name = "BotanShim-${botan2.version}";
98
src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni;
109

1110
buildInputs = [
1211
botan2
1312
pkg-config
14-
jdk
13+
pkgs.jdk_headless
1514
];
1615

1716
buildPhase = ''
1817
make botan
1918
'';
2019

21-
BOTAN_CXXFLAGS = "-DECTESTER_BOTAN_${builtins.replaceStrings ["."] ["_"] botan2.version}=1";
20+
BOTAN_CXXFLAGS = ''
21+
-DECTESTER_BOTAN_${builtins.replaceStrings ["."] ["_"] botan2.version}=1 \
22+
-DECTESTER_BOTAN_MAJOR=${pkgs.lib.versions.major botan2.version} \
23+
-DECTESTER_BOTAN_MINOR=${pkgs.lib.versions.minor botan2.version} \
24+
-DECTESTER_BOTAN_PATCH=${pkgs.lib.versions.patch botan2.version} \
25+
'';
2226

2327
installPhase = ''
2428
mkdir --parents $out/lib

‎nix/commonlibs.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88
pkg-config
99
cmake
1010
which
11-
jdk
11+
pkgs.jdk_headless
1212
];
1313

1414
dontUseCmakeConfigure = true;

‎nix/cryptoppshim.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ let
44
dotVersion = builtins.replaceStrings ["_"] ["."] cryptopp.version;
55
in
66
stdenv.mkDerivation {
7-
name = "Crypto++ Shim";
7+
name = "Crypto++Shim-${cryptopp.version}";
88
src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni;
99

1010
buildInputs = [
1111
cryptopp
1212
pkg-config
13-
jdk
13+
pkgs.jdk_headless
1414
];
1515

1616
buildPhase = ''

‎nix/gcryptshim.nix

+8-3
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,26 @@
55
}:
66
with pkgs;
77
stdenv.mkDerivation {
8-
name = "Gcrypt Shim";
8+
name = "GcryptShim-${libgcrypt.version}";
99
src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni;
1010

1111
buildInputs = [
1212
libgcrypt
1313
libgpg-error
1414
pkg-config
15-
jdk11_headless
15+
pkgs.jdk_headless
1616
];
1717

1818
buildPhase = ''
1919
make gcrypt
2020
'';
2121

22-
LIBGCRYPT_CFLAGS = "-DECTESTER_LIBGCRYPT_${builtins.replaceStrings ["."] ["_"] libgcrypt.version}=1";
22+
LIBGCRYPT_CFLAGS = ''
23+
-DECTESTER_LIBGCRYPT_${builtins.replaceStrings ["."] ["_"] libgcrypt.version}=1 \
24+
-DECTESTER_LIBGCRYPT_MAJOR=${pkgs.lib.versions.major libgcrypt.version} \
25+
-DECTESTER_LIBGCRYPT_MINOR=${pkgs.lib.versions.minor libgcrypt.version} \
26+
-DECTESTER_LIBGCRYPT_PATCH=${pkgs.lib.versions.patch libgcrypt.version} \
27+
'';
2328

2429
installPhase = ''
2530
mkdir --parents $out/lib

‎nix/ippcpshim.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{ pkgs, ipp-crypto }:
22
with pkgs;
33
stdenv.mkDerivation rec {
4-
name = "IppCryptoShim";
4+
name = "IppCryptoShim-${ipp-crypto.version}";
55
src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni;
66

77
buildInputs = [
88
ipp-crypto
99
pkg-config
10-
jdk
10+
pkgs.jdk_headless
1111
];
1212

13-
IPP_CRYPTO_CFLAGS = "-I${ipp-crypto.dev}/include -DECTESTER_IPPCP_VERSION=${ipp-crypto.version}";
13+
IPP_CRYPTO_CFLAGS = "-I${ipp-crypto.dev}/include -DECTESTER_IPPCP_${ipp-crypto.version}=1";
1414
IPP_CRYPTO_LFLAGS = "-L${ipp-crypto}/lib/";
1515

1616
buildPhase = ''

‎nix/libresslshim.nix

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
{ pkgs, libressl }:
22
with pkgs;
33
stdenv.mkDerivation rec {
4-
name = "LibreSSLShim";
4+
name = "LibreSSLShim-${libressl.version}";
55
src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni;
66

77
buildInputs = [
88
libressl
99
pkg-config
10-
jdk
10+
pkgs.jdk_headless
1111
];
1212

1313
buildPhase = ''
1414
make libressl
1515
'';
1616

17-
LIBRESSL_CFLAGS = "-DECTESTER_LIBRESSL_${builtins.replaceStrings ["."] ["_"] libressl.version}=1";
17+
LIBRESSL_CFLAGS = ''
18+
-DECTESTER_LIBRESSL_${builtins.replaceStrings ["."] ["_"] libressl.version}=1 \
19+
-DECTESTER_LIBRESSL_MAJOR=${pkgs.lib.versions.major libressl.version} \
20+
-DECTESTER_LIBRESSL_MINOR=${pkgs.lib.versions.minor libressl.version} \
21+
-DECTESTER_LIBRESSL_PATCH=${pkgs.lib.versions.patch libressl.version} \
22+
'';
1823

1924
installPhase = ''
2025
mkdir --parents $out/lib

‎nix/mbedtlsshim.nix

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{ pkgs, mbedtls }:
22
with pkgs;
3+
let
4+
rawVersion = pkgs.lib.strings.removePrefix "v" mbedtls.version;
5+
in
36
stdenv.mkDerivation rec {
4-
name = "MbedTLSShim";
7+
name = "MbedTLSShim-${mbedtls.version}";
58
src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni;
6-
rawVersion = pkgs.lib.strings.removePrefix "v" mbedtls.version;
9+
710

811
buildInputs = [
912
mbedtls
1013
pkg-config
11-
jdk
14+
pkgs.jdk_headless
1215
];
1316

1417
buildPhase = ''

‎nix/nettleshim.nix

+8-3
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,26 @@
55
}:
66
with pkgs;
77
stdenv.mkDerivation rec {
8-
name = "NettleShim";
8+
name = "NettleShim-${nettle.version}";
99
src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni;
1010

1111
buildInputs = [
1212
nettle
1313
gmp
1414
pkg-config
15-
jdk
15+
pkgs.jdk_headless
1616
];
1717

1818
buildPhase = ''
1919
make nettle
2020
'';
2121

22-
NETTLE_CFLAGS = "-DECTESTER_NETTLE_${builtins.replaceStrings ["."] ["_"] nettle.version}=1";
22+
NETTLE_CFLAGS = ''
23+
-DECTESTER_NETTLE_${builtins.replaceStrings ["."] ["_"] nettle.version}=1 \
24+
-DECTESTER_NETTLE_MAJOR=${pkgs.lib.versions.major nettle.version} \
25+
-DECTESTER_NETTLE_MINOR=${pkgs.lib.versions.minor nettle.version} \
26+
-DECTESTER_NETTLE_PATCH=${pkgs.lib.versions.patch nettle.version} \
27+
'';
2328

2429
installPhase = ''
2530
mkdir --parents $out/lib

‎nix/opensslshim.nix

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
{ pkgs, openssl }:
22
with pkgs;
33
stdenv.mkDerivation {
4-
name = "OpenSSL Shim";
4+
name = "OpenSSLShim-${openssl.version}";
55
src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni;
66

77
buildInputs = [
88
openssl
99
pkg-config
10-
jdk
10+
pkgs.jdk_headless
1111
];
1212

1313
buildPhase = ''
1414
make openssl
1515
'';
1616

17-
OPENSSL_CFLAGS = "-DECTESTER_OPENSSL_${builtins.replaceStrings ["."] ["_"] openssl.version}=1";
17+
OPENSSL_CFLAGS = ''
18+
-DECTESTER_OPENSSL_${builtins.replaceStrings ["."] ["_"] openssl.version}=1 \
19+
-DECTESTER_OPENSSL_MAJOR=${pkgs.lib.versions.major openssl.version} \
20+
-DECTESTER_OPENSSL_MINOR=${pkgs.lib.versions.minor openssl.version} \
21+
-DECTESTER_OPENSSL_PATCH=${pkgs.lib.versions.patch openssl.version} \
22+
'';
1823

1924
installPhase = ''
2025
mkdir --parents $out/lib

‎nix/tomcryptshim.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
}:
66
with pkgs;
77
stdenv.mkDerivation {
8-
name = "TomCryptShim";
8+
name = "TomCryptShim-${libtomcrypt.version}";
99
src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni;
1010

1111
buildInputs = [
1212
libtommath
1313
libtomcrypt
1414
pkg-config
15-
jdk
15+
pkgs.jdk_headless
1616
];
1717

1818
buildPhase = ''

0 commit comments

Comments
 (0)