Commit ccdd0a2 1 parent 1d10818 commit ccdd0a2 Copy full SHA for ccdd0a2
File tree 2 files changed +20
-29
lines changed
standalone/src/main/java/cz/crcs/ectester/standalone/libs
2 files changed +20
-29
lines changed Original file line number Diff line number Diff line change 46
46
mv crypto/libcrypto.a $out/lib/lib_boringssl.a
47
47
popd
48
48
'' ;
49
-
50
49
} ) ;
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
+ } ) ;
53
60
libressl = pkgs . libressl . overrideAttrs ( _old : rec {
54
61
# devLibPath = pkgs.lib.makeLibraryPath [ pkgs.libressl.dev ];
55
62
# pname = "libressl";
99
106
} ;
100
107
buildECTesterStandalone = { opensslVersion , opensslHash } : (
101
108
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 ; } ) ;
119
110
in
120
111
with pkgs ;
121
112
gradle2nix . builders . ${ system } . buildGradlePackage rec {
146
137
pkg-config
147
138
global-platform-pro
148
139
gradle
149
- # patched_openssl
140
+ opensslx
150
141
makeWrapper
151
142
152
143
# libraries to test
189
180
buildInputs = [
190
181
jdk17_headless
191
182
# libressl
192
- # patched_openssl
183
+ opensslx
193
184
] ;
194
185
195
186
LD_LIBRARY_PATH = lib . makeLibraryPath [
201
192
botan2
202
193
cryptopp
203
194
libgcrypt
204
- patched_openssl
205
- libressl
195
+ opensslx
206
196
patched_boringssl
207
197
ninja
208
198
nettle
219
209
installPhase = ''
220
210
mkdir -p $out
221
211
cp -r standalone/build $out
222
- echo ${ opensslVersion } > $out/build/opensslVersion
212
+ ls ${ opensslx } /lib/* > $out/po
223
213
'' ;
224
-
214
+
225
215
postFixup = ''
226
216
makeWrapper \
227
217
${ jdk17_headless } /bin/java $out/bin/${ pname } \
269
259
global-platform-pro
270
260
gradle
271
261
# libraries to test
272
- openssl
262
+ ( openssl { } )
273
263
libressl
274
264
# glibc
275
265
patched_boringssl
313
303
libtomcrypt
314
304
botan2
315
305
cryptopp
316
- openssl
306
+ # (openssl {})
307
+ ( openssl { } )
317
308
patched_boringssl
318
309
libgcrypt
319
310
nettle
Original file line number Diff line number Diff line change 8
8
*/
9
9
public class OpensslLib extends NativeECLibrary {
10
10
public OpensslLib () {
11
- super ("OpenSSL" , "openssl_provider" , "crypto" );
11
+ super ("OpenSSL" , "openssl_provider" );
12
12
}
13
13
14
14
@ Override
You can’t perform that action at this time.
0 commit comments