From b76005ad7d5b700529d5a136f1c56095a18473dd Mon Sep 17 00:00:00 2001 From: Christian Ulrich Date: Thu, 29 Oct 2020 17:51:02 +0100 Subject: [PATCH] Revert "remove the picotls header files" This reverts commit e86c37422b81a8cc20594b20f08e20860116378a. --- pkgs/cadet-gtk/default.nix | 6 ++---- pkgs/quicly/default.nix | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/cadet-gtk/default.nix b/pkgs/cadet-gtk/default.nix index 0fc54e6..24567b9 100644 --- a/pkgs/cadet-gtk/default.nix +++ b/pkgs/cadet-gtk/default.nix @@ -5,7 +5,6 @@ , libextractor , libgcrypt , libhandy -, libnotify , gnunet , gtk3 , pkgconfig @@ -19,8 +18,8 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "TheJackiMonster"; repo = "cadet-gtk"; - rev = "14a5a86e06d66b75b1e1e12f332cba2d68644493"; - sha256 = "0ai0sxghkj4zln0j74hsc7gmk9cfkmw8iqz29vckf4636f8bh3mn"; + rev = "v${version}"; + sha256 = "09a3ga5gfvrdq0z4325p7ndb78mg3lkc021c8bhkf6dxd76qm7r5"; }; nativeBuildInputs = [ @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { libextractor libgcrypt libhandy - libnotify gnunet gtk3 ]; diff --git a/pkgs/quicly/default.nix b/pkgs/quicly/default.nix index 9f3f184..a037842 100644 --- a/pkgs/quicly/default.nix +++ b/pkgs/quicly/default.nix @@ -59,6 +59,8 @@ stdenv.mkDerivation rec { install -Dt $out/lib *.a install -Dt $dev/include ../include/quicly.h install -Dt $dev/include/quicly ../include/quicly/*.h + install -Dt $dev/include ${picotls}/include/picotls.h + install -Dt $dev/include/picotls ${picotls}/include/picotls/*.h runHook postInstall '';