Skip to content

Commit ccdd0a2

Browse files
committed
Unify patching OpenSSL for all Flake outputs
1 parent 1d10818 commit ccdd0a2

File tree

2 files changed

+20
-29
lines changed

2 files changed

+20
-29
lines changed

flake.nix

+19-28
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,17 @@
4646
mv crypto/libcrypto.a $out/lib/lib_boringssl.a
4747
popd
4848
'';
49-
5049
});
51-
52-
50+
# FIXME: `nix develeop` now has different version than `nix run`
51+
openssl = { version ? "", hash ? "" }: (pkgs.openssl.override { static = true; }).overrideAttrs (final: prev: rec {
52+
pname = "openssl";
53+
src = if version != "" then pkgs.fetchurl {
54+
url = "https://www.openssl.org/source/openssl-${version}.tar.gz";
55+
hash = hash;
56+
} else prev.src;
57+
# FIXME Removing patches might cause unwanted things; this should be version based!
58+
patches = [];
59+
});
5360
libressl = pkgs.libressl.overrideAttrs (_old: rec {
5461
# devLibPath = pkgs.lib.makeLibraryPath [ pkgs.libressl.dev ];
5562
# pname = "libressl";
@@ -99,23 +106,7 @@
99106
};
100107
buildECTesterStandalone = { opensslVersion, opensslHash }: (
101108
let
102-
patched_openssl = pkgs.openssl.overrideAttrs (_old: rec {
103-
version = opensslVersion;
104-
pname = "openssl";
105-
src = pkgs.fetchurl {
106-
url = "https://www.openssl.org/source/openssl-${version}.tar.gz";
107-
hash = opensslHash;
108-
};
109-
# FIXME Removing patches might cause unwanted things.
110-
patches = [];
111-
});
112-
113-
# devLibPath = pkgs.lib.makeLibraryPath [ pkgs.libressl.dev ];
114-
# libressl = pkgs.libressl.overrideAttrs (_old: {
115-
# fixupPhase = ''
116-
# cp ${devLibPath}/openssl.pc ${devLibPath}/libressl.pc
117-
# '';
118-
# });
109+
opensslx = (openssl { version = opensslVersion; hash = opensslHash; });
119110
in
120111
with pkgs;
121112
gradle2nix.builders.${system}.buildGradlePackage rec {
@@ -146,7 +137,7 @@
146137
pkg-config
147138
global-platform-pro
148139
gradle
149-
# patched_openssl
140+
opensslx
150141
makeWrapper
151142

152143
# libraries to test
@@ -189,7 +180,7 @@
189180
buildInputs = [
190181
jdk17_headless
191182
# libressl
192-
# patched_openssl
183+
opensslx
193184
];
194185

195186
LD_LIBRARY_PATH = lib.makeLibraryPath [
@@ -201,8 +192,7 @@
201192
botan2
202193
cryptopp
203194
libgcrypt
204-
patched_openssl
205-
libressl
195+
opensslx
206196
patched_boringssl
207197
ninja
208198
nettle
@@ -219,9 +209,9 @@
219209
installPhase = ''
220210
mkdir -p $out
221211
cp -r standalone/build $out
222-
echo ${opensslVersion} > $out/build/opensslVersion
212+
ls ${opensslx}/lib/* > $out/po
223213
'';
224-
214+
225215
postFixup = ''
226216
makeWrapper \
227217
${jdk17_headless}/bin/java $out/bin/${pname} \
@@ -269,7 +259,7 @@
269259
global-platform-pro
270260
gradle
271261
# libraries to test
272-
openssl
262+
(openssl {})
273263
libressl
274264
# glibc
275265
patched_boringssl
@@ -313,7 +303,8 @@
313303
libtomcrypt
314304
botan2
315305
cryptopp
316-
openssl
306+
# (openssl {})
307+
(openssl {})
317308
patched_boringssl
318309
libgcrypt
319310
nettle

standalone/src/main/java/cz/crcs/ectester/standalone/libs/OpensslLib.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
public class OpensslLib extends NativeECLibrary {
1010
public OpensslLib() {
11-
super("OpenSSL", "openssl_provider", "crypto");
11+
super("OpenSSL", "openssl_provider");
1212
}
1313

1414
@Override

0 commit comments

Comments
 (0)