@@ -19,8 +19,6 @@ assert (
1919# cgit) that are needed here should be included directly in Nixpkgs as
2020# files.
2121
22−with lib;
23−
2422let
2523 common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }:
2624 stdenv.mkDerivation rec {
@@ -36,7 +34,7 @@ let
3634
3735 postPatch = ''
3836 patchShebangs Configure
39− '' + optionalString (versionOlder version "1.1.0") ''
37+ '' + lib.optionalString (lib.versionOlder version "1.1.0") ''
4038 patchShebangs test/*
4139 for a in test/t* ; do
4240 substituteInPlace "$a" \
@@ -44,15 +42,15 @@ let
4442 done
4543 ''
4644 # config is a configure script which is not installed.
47− + optionalString (versionAtLeast version "1.1.1") ''
45+ + lib.optionalString (lib.versionAtLeast version "1.1.1") ''
4846 substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env'
49− '' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) ''
47+ '' + lib.optionalString (lib.versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) ''
5048 substituteInPlace crypto/async/arch/async_posix.h \
5149 --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
5250 '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
5351 '';
5452
55− outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
53+ outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional withDocs "doc";
5654 setOutputFlags = false;
5755 separateDebugInfo =
5856 !stdenv.hostPlatform.isDarwin &&
@@ -86,7 +84,7 @@ let
8684 else if stdenv.hostPlatform.isBSD
8785 then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}"
8886 else if stdenv.hostPlatform.isMinGW
89− then "./Configure mingw${optionalString
87+ then "./Configure mingw${lib.optionalString
9088 (stdenv.hostPlatform.parsed.cpu.bits != 32)
9189 (toString stdenv.hostPlatform.parsed.cpu.bits)}"
9290 else if stdenv.hostPlatform.isLinux
@@ -108,12 +106,12 @@ let
108106 "-DUSE_CRYPTODEV_DIGESTS"
109107 ] ++ lib.optional enableSSL2 "enable-ssl2"
110108 ++ lib.optional enableSSL3 "enable-ssl3"
111− ++ lib.optional (versionAtLeast version "3.0.0") "enable-ktls"
112− ++ lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
109+ ++ lib.optional (lib.versionAtLeast version "3.0.0") "enable-ktls"
110+ ++ lib.optional (lib.versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
113111 # OpenSSL needs a specific `no-shared` configure flag.
114112 # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
115113 # for a comprehensive list of configuration options.
116− ++ lib.optional (versionAtLeast version "1.1.0" && static) "no-shared";
114+ ++ lib.optional (lib.versionAtLeast version "1.1.0" && static) "no-shared";
117115
118116 makeFlags = [
119117 "MANDIR=$(man)/share/man"