b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

quictls: use finalAttrs pattern

Browse source
This commit is contained in:
Pol Dellaiera 2023-08-06 21:19:41 +02:00
parent 618500728e
commit 472ad2b1ef
No known key found for this signature in database
GPG key ID: D476DFE9C67467CA
1 changed files with 80 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

145
pkgs/development/libraries/quictls/default.nix
View file

@ -1,21 +1,27 @@
{ lib, stdenv, fetchurl, buildPackages, perl, coreutils, fetchFromGitHub {
, makeWrapper buildPackages
, withCryptodev ? false, cryptodev , cryptodev
, enableSSL2 ? false , enableSSL2 ? false
, enableSSL3 ? false , enableSSL3 ? false
, static ? stdenv.hostPlatform.isStatic , fetchFromGitHub
, lib
, makeWrapper
, perl
, removeReferencesTo , removeReferencesTo
, static ? stdenv.hostPlatform.isStatic
, stdenv
, withCryptodev ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "quictls"; pname = "quictls";
version = "3.0.10-quic1"; version = "3.0.10-quic1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "quictls"; owner = "quictls";
repo = "openssl"; repo = "openssl";
rev = "openssl-${version}"; rev = "openssl-${finalAttrs.version}";
sha256 = "sha256-PTHZCj5aqwFrrvydut9ZS04EJ7YPywKAjbXBBihj4Gg="; hash = "sha256-PTHZCj5aqwFrrvydut9ZS04EJ7YPywKAjbXBBihj4Gg=";
}; };
patches = [ patches = [
@ -26,8 +32,8 @@ stdenv.mkDerivation rec {
../openssl/3.0/openssl-disable-kernel-detection.patch ../openssl/3.0/openssl-disable-kernel-detection.patch
(if stdenv.hostPlatform.isDarwin (if stdenv.hostPlatform.isDarwin
then ../openssl/use-etc-ssl-certs-darwin.patch then ../openssl/use-etc-ssl-certs-darwin.patch
else ../openssl/use-etc-ssl-certs.patch) else ../openssl/use-etc-ssl-certs.patch)
]; ];
postPatch = '' postPatch = ''
@ -42,56 +48,66 @@ stdenv.mkDerivation rec {
'!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
''; '';
nativeBuildInputs = [
makeWrapper
perl
removeReferencesTo
];
buildInputs = lib.optionals withCryptodev [
cryptodev
];
outputs = [ "bin" "dev" "out" "man" "doc" ]; outputs = [ "bin" "dev" "out" "man" "doc" ];
setOutputFlags = false; setOutputFlags = false;
separateDebugInfo = separateDebugInfo =
!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isDarwin &&
!(stdenv.hostPlatform.useLLVM or false) && !(stdenv.hostPlatform.useLLVM or false) &&
stdenv.cc.isGNU; stdenv.cc.isGNU;
nativeBuildInputs = [ makeWrapper perl removeReferencesTo ];
buildInputs = lib.optional withCryptodev cryptodev;
# TODO(@Ericson2314): Improve with mass rebuild # TODO(@Ericson2314): Improve with mass rebuild
configurePlatforms = []; configurePlatforms = [ ];
configureScript = { configureScript = {
armv5tel-linux = "./Configure linux-armv4 -march=armv5te"; armv5tel-linux = "./Configure linux-armv4 -march=armv5te";
armv6l-linux = "./Configure linux-armv4 -march=armv6"; armv6l-linux = "./Configure linux-armv4 -march=armv6";
armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
x86_64-darwin = "./Configure darwin64-x86_64-cc"; x86_64-darwin = "./Configure darwin64-x86_64-cc";
aarch64-darwin = "./Configure darwin64-arm64-cc"; aarch64-darwin = "./Configure darwin64-arm64-cc";
x86_64-linux = "./Configure linux-x86_64"; x86_64-linux = "./Configure linux-x86_64";
x86_64-solaris = "./Configure solaris64-x86_64-gcc"; x86_64-solaris = "./Configure solaris64-x86_64-gcc";
riscv64-linux = "./Configure linux64-riscv64"; riscv64-linux = "./Configure linux64-riscv64";
mips64el-linux = mips64el-linux =
if stdenv.hostPlatform.isMips64n64 if stdenv.hostPlatform.isMips64n64
then "./Configure linux64-mips64" then "./Configure linux64-mips64"
else if stdenv.hostPlatform.isMips64n32 else if stdenv.hostPlatform.isMips64n32
then "./Configure linux-mips64" then "./Configure linux-mips64"
else throw "unsupported ABI for ${stdenv.hostPlatform.system}"; else throw "unsupported ABI for ${stdenv.hostPlatform.system}";
}.${stdenv.hostPlatform.system} or ( }.${stdenv.hostPlatform.system} or (
if stdenv.hostPlatform == stdenv.buildPlatform if stdenv.hostPlatform == stdenv.buildPlatform
then "./config" then "./config"
else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_64 else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_64
then "./Configure BSD-x86_64" then "./Configure BSD-x86_64"
else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_32 else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_32
then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf" then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf"
else if stdenv.hostPlatform.isBSD else if stdenv.hostPlatform.isBSD
then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}"
else if stdenv.hostPlatform.isMinGW else if stdenv.hostPlatform.isMinGW
then "./Configure mingw${lib.optionalString then "./Configure mingw${lib.optionalString
(stdenv.hostPlatform.parsed.cpu.bits != 32) (stdenv.hostPlatform.parsed.cpu.bits != 32)
(toString stdenv.hostPlatform.parsed.cpu.bits)}" (toString stdenv.hostPlatform.parsed.cpu.bits)}"
else if stdenv.hostPlatform.isLinux else if stdenv.hostPlatform.isLinux
then "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" then "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}"
else if stdenv.hostPlatform.isiOS else if stdenv.hostPlatform.isiOS
then "./Configure ios${toString stdenv.hostPlatform.parsed.cpu.bits}-cross" then "./Configure ios${toString stdenv.hostPlatform.parsed.cpu.bits}-cross"
else else
throw "Not sure what configuration to use for ${stdenv.hostPlatform.config}" throw "Not sure what configuration to use for ${stdenv.hostPlatform.config}"
); );
# OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags.
dontAddStaticConfigureFlags = true; dontAddStaticConfigureFlags = true;
configureFlags = [ configureFlags = [
"shared" # "shared" builds both shared and static libraries "shared" # "shared" builds both shared and static libraries
"--libdir=lib" "--libdir=lib"
@ -100,19 +116,18 @@ stdenv.mkDerivation rec {
"-DHAVE_CRYPTODEV" "-DHAVE_CRYPTODEV"
"-DUSE_CRYPTODEV_DIGESTS" "-DUSE_CRYPTODEV_DIGESTS"
] ++ lib.optional enableSSL2 "enable-ssl2" ] ++ lib.optional enableSSL2 "enable-ssl2"
++ lib.optional enableSSL3 "enable-ssl3" ++ lib.optional enableSSL3 "enable-ssl3"
# We select KTLS here instead of the configure-time detection (which we patch out). # We select KTLS here instead of the configure-time detection (which we patch out).
# KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it. # KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it.
++ lib.optional (stdenv.isLinux && lib.versionAtLeast version "3.0.0") "enable-ktls" ++ lib.optional (stdenv.isLinux && lib.versionAtLeast finalAttrs.version "3.0.0") "enable-ktls"
++ lib.optional stdenv.hostPlatform.isAarch64 "no-afalgeng" ++ lib.optional stdenv.hostPlatform.isAarch64 "no-afalgeng"
# OpenSSL needs a specific `no-shared` configure flag. # OpenSSL needs a specific `no-shared` configure flag.
# See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
# for a comprehensive list of configuration options. # for a comprehensive list of configuration options.
++ lib.optional static "no-shared" ++ lib.optional static "no-shared"
# This introduces a reference to the CTLOG_FILE which is undesired when # This introduces a reference to the CTLOG_FILE which is undesired when
# trying to build binaries statically. # trying to build binaries statically.
++ lib.optional static "no-ct" ++ lib.optional static "no-ct";
;
makeFlags = [ makeFlags = [
"MANDIR=$(man)/share/man" "MANDIR=$(man)/share/man"
@ -160,12 +175,12 @@ stdenv.mkDerivation rec {
fi fi
''; '';
meta = with lib; { meta = {
homepage = "https://quictls.github.io"; changelog = "https://github.com/quictls/openssl/blob/${finalAttrs.src.rev}/CHANGES.md";
description = "TLS/SSL and crypto library with QUIC APIs"; description = "TLS/SSL and crypto library with QUIC APIs";
changelog = "https://github.com/quictls/openssl/blob/${src.rev}/CHANGES.md"; homepage = "https://quictls.github.io";
license = licenses.openssl; license = lib.licenses.openssl;
platforms = platforms.all; maintainers = with lib.maintainers; [ izorkin ];
maintainers = with maintainers; [ izorkin ]; platforms = lib.platforms.all;
}; };
} })