From 504c577315bcc4dcf7b6da2863143a5578fb78ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 1 Jun 2021 17:20:23 +0200 Subject: [PATCH] s2n-tls: split dev output to reduce Nix closure --- pkgs/development/libraries/aws-c-io/default.nix | 2 +- pkgs/development/libraries/s2n-tls/default.nix | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 39230cc088d..80112926ca6 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common s2n-tls]; + buildInputs = [ aws-c-cal aws-c-common s2n-tls ]; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index b54fd0b74a7..5bae8df59e6 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -13,12 +13,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). + outputs = [ "out" "dev"]; + + buildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; + propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). + + postInstall = '' + substituteInPlace $out/lib/s2n/cmake/shared/s2n-targets.cmake \ + --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' + ''; + meta = with lib; { description = "C99 implementation of the TLS/SSL protocols"; homepage = "https://github.com/aws/s2n-tls";