Unverified Commit 862d555e authored by Vladimír Čunát's avatar Vladimír Čunát Committed by GitHub
Browse files

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

parents f4b140d5 2f7e2308

pkgs/by-name/kn/knot-dns/package.nix

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ stdenv.mkDerivation rec { 
  # FIXME: sphinx is needed for now to get man-pages

  nativeBuildInputs = [

    pkg-config

    protobufc # dnstap support

    autoreconfHook

    sphinx

  ];
@@ -94,6 +95,7 @@ stdenv.mkDerivation rec { 
  ++ lib.optional stdenv.hostPlatform.isDarwin zlib; # perhaps due to gnutls



  enableParallelBuilding = true;

  strictDeps = true;



  CFLAGS = [

    "-O2"

pkgs/by-name/xd/xdp-tools/package.nix

+3 −1
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  buildPackages,

  fetchFromGitHub,

  libbpf,

  elfutils,
@@ -42,7 +43,6 @@ stdenv.mkDerivation rec { 
  ];

  nativeBuildInputs = [

    bpftools

    llvmPackages.clang

    llvmPackages.llvm

    pkg-config

    m4
@@ -55,6 +55,8 @@ stdenv.mkDerivation rec { 
  hardeningDisable = [ "zerocallusedregs" ];

  # When building BPF, the default CC wrapper is interfering a bit too much.

  BPF_CFLAGS = "-fno-stack-protector -Wno-error=unused-command-line-argument";

  # When cross compiling, configure prefers the unwrapped clang unless told otherwise.

  CLANG = lib.getExe buildPackages.llvmPackages.clang;



  PRODUCTION = 1;

  DYNAMIC_LIBXDP = 1;