ettercap: fix pango not finding hb.h from harfbuzz#75789
ettercap: fix pango not finding hb.h from harfbuzz#75789mkg20001 wants to merge 1 commit intoNixOS:masterfrom
Conversation
|
I think the the main thing is that most documentation says to do: but they publish the headers as $dev/include/harfbuzz/hb* In their defense, the harfbuzz.pc correctly states the includedir, but a lot of packages seem to disregard this. |
|
I think this PR fixes it upstream https://github.com/Ettercap/ettercap/pull/969/files. Can you apply it here? |
|
Still the same diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix
index 164d11bd39f..5ca7aac7468 100644
--- a/pkgs/applications/networking/sniffers/ettercap/default.nix
+++ b/pkgs/applications/networking/sniffers/ettercap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, libpcap, libnet, zlib, curl, pcre
, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip, harfbuzz
, pkgconfig }:
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
sha256 = "0m40bmbrv9a8qlg54z3b5f8r541gl9vah5hm0bbqcgyyljpg39bz";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/Ettercap/ettercap/compare/ebc85131c656ea13907195b6e1981e0f8c121c50...78da46d1488fa9903344fc993555461f54ae9c6a.diff";
+ sha256 = "02nzps4ca3d20gvykyaz8qjnsgjvks2czfmq8ic9xk17v2pn19ji";
+ })
+ ];
+
strictDeps = true;
nativeBuildInputs = [ cmake flex bison pkgconfig ];
buildInputs = [
@@ -31,8 +38,6 @@ stdenv.mkDerivation rec {
"-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
];
- NIX_CFLAGS_COMPILE = [ "-I${harfbuzz.dev}/include/harfbuzz" ];
-
meta = with stdenv.lib; {
description = "Comprehensive suite for man in the middle attacks";
homepage = http://ettercap.github.io/ettercap/; |
|
Thanks, I pushed this in b9f7819 (with an additional TODO). It should work with the next release / Ettercap/ettercap@02960cb but |
(cherry picked from commit b9f7819)
|
backported to 20.03 in 834841c |
Motivation for this change
It's broken, fixed it
The error message
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @pSub