knot-dns, xdp-tools: fix cross compilation (#442827)

authored by Vladimír Čunát and committed by GitHub 862d555e f4b140d5

+5 -1
+2
pkgs/by-name/kn/knot-dns/package.nix
··· 64 # FIXME: sphinx is needed for now to get man-pages 65 nativeBuildInputs = [ 66 pkg-config 67 autoreconfHook 68 sphinx 69 ]; ··· 94 ++ lib.optional stdenv.hostPlatform.isDarwin zlib; # perhaps due to gnutls 95 96 enableParallelBuilding = true; 97 98 CFLAGS = [ 99 "-O2"
··· 64 # FIXME: sphinx is needed for now to get man-pages 65 nativeBuildInputs = [ 66 pkg-config 67 + protobufc # dnstap support 68 autoreconfHook 69 sphinx 70 ]; ··· 95 ++ lib.optional stdenv.hostPlatform.isDarwin zlib; # perhaps due to gnutls 96 97 enableParallelBuilding = true; 98 + strictDeps = true; 99 100 CFLAGS = [ 101 "-O2"
+3 -1
pkgs/by-name/xd/xdp-tools/package.nix
··· 1 { 2 lib, 3 stdenv, 4 fetchFromGitHub, 5 libbpf, 6 elfutils, ··· 42 ]; 43 nativeBuildInputs = [ 44 bpftools 45 - llvmPackages.clang 46 llvmPackages.llvm 47 pkg-config 48 m4 ··· 55 hardeningDisable = [ "zerocallusedregs" ]; 56 # When building BPF, the default CC wrapper is interfering a bit too much. 57 BPF_CFLAGS = "-fno-stack-protector -Wno-error=unused-command-line-argument"; 58 59 PRODUCTION = 1; 60 DYNAMIC_LIBXDP = 1;
··· 1 { 2 lib, 3 stdenv, 4 + buildPackages, 5 fetchFromGitHub, 6 libbpf, 7 elfutils, ··· 43 ]; 44 nativeBuildInputs = [ 45 bpftools 46 llvmPackages.llvm 47 pkg-config 48 m4 ··· 55 hardeningDisable = [ "zerocallusedregs" ]; 56 # When building BPF, the default CC wrapper is interfering a bit too much. 57 BPF_CFLAGS = "-fno-stack-protector -Wno-error=unused-command-line-argument"; 58 + # When cross compiling, configure prefers the unwrapped clang unless told otherwise. 59 + CLANG = lib.getExe buildPackages.llvmPackages.clang; 60 61 PRODUCTION = 1; 62 DYNAMIC_LIBXDP = 1;