public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dnsmasq: fix cross-compilation

Browse Source 
This is done by specifying pkg-config in the makeFlags, ensuring that
the correct pkg-config is injected.

Depends on changes that are currently only in staging:

- 07ecf87693
- 4f6ec19dbc

See https://github.com/NixOS/nixpkgs/pull/114902 for those changes.
This commit is contained in:
Rick van Schijndel 2021-03-14 21:18:31 +01:00 committed by github-actions[bot]
parent e3e59d4ab7
commit b12f16f283
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/networking/dnsmasq/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, dbus, nettle, fetchpatch { lib, stdenv, fetchurl, pkg-config, dbus, nettle, fetchpatch
, libidn, libnetfilter_conntrack }: , libidn, libnetfilter_conntrack, buildPackages }:
with lib; with lib;
let let
@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
"BINDIR=$(out)/bin" "BINDIR=$(out)/bin"
"MANDIR=$(out)/man" "MANDIR=$(out)/man"
"LOCALEDIR=$(out)/share/locale" "LOCALEDIR=$(out)/share/locale"
"PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
]; ];
hardeningEnable = [ "pie" ]; hardeningEnable = [ "pie" ];