ettercap: fix pango not finding hb.h from harfbuzz (#75789)

This commit is contained in:
Maciej Krüger 2019-12-16 20:53:52 +01:00 committed by Michael Weiss
parent fd27f46cb3
commit b9f7819bd3
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre { stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre
, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip , openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip, harfbuzz
, pkgconfig }: , pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake flex bison pkgconfig ]; nativeBuildInputs = [ cmake flex bison pkgconfig ];
buildInputs = [ buildInputs = [
libpcap libnet zlib curl pcre openssl ncurses libpcap libnet zlib curl pcre openssl ncurses
glib gtk3 atk pango geoip glib gtk3 atk pango geoip harfbuzz
]; ];
preConfigure = '' preConfigure = ''
@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
"-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
]; ];
# TODO: Remove after the next release (0.8.4 should work without this):
NIX_CFLAGS_COMPILE = [ "-I${harfbuzz.dev}/include/harfbuzz" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Comprehensive suite for man in the middle attacks"; description = "Comprehensive suite for man in the middle attacks";
homepage = http://ettercap.github.io/ettercap/; homepage = http://ettercap.github.io/ettercap/;