summary refs log tree commit diff
path: root/pkgs/development/libraries/avahi
diff options
context:
space:
mode:
authorMichael Bishop <cleverca22@gmail.com>2020-07-02 02:56:08 -0300
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2020-07-02 17:15:54 +0200
commit65a5313de5d34d73e2930bd132fe476f57f1b60f (patch)
treef085732e19cdadb18d9e6425fca77cc76322646f /pkgs/development/libraries/avahi
parentc33ca7c5ce4d80246fd656dd8a5ab078cc90c03d (diff)
downloadnixpkgs-65a5313de5d34d73e2930bd132fe476f57f1b60f.tar
nixpkgs-65a5313de5d34d73e2930bd132fe476f57f1b60f.tar.gz
nixpkgs-65a5313de5d34d73e2930bd132fe476f57f1b60f.tar.bz2
nixpkgs-65a5313de5d34d73e2930bd132fe476f57f1b60f.tar.lz
nixpkgs-65a5313de5d34d73e2930bd132fe476f57f1b60f.tar.xz
nixpkgs-65a5313de5d34d73e2930bd132fe476f57f1b60f.tar.zst
nixpkgs-65a5313de5d34d73e2930bd132fe476f57f1b60f.zip
avahi: fix cross
Diffstat (limited to 'pkgs/development/libraries/avahi')
-rw-r--r--pkgs/development/libraries/avahi/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 4c7e5321f55..8568d5dd2ab 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages
-, expat, gettext, intltool, glib, libiconv
+, expat, gettext, intltool, glib, libiconv, writeShellScriptBin
 , gtk3Support ? false, gtk3 ? null
 , qt4 ? null
 , qt4Support ? false
@@ -9,6 +9,11 @@
 
 assert qt4Support -> qt4 != null;
 
+let
+  # despite the configure script claiming it supports $PKG_CONFIG, it doesnt respect it
+  pkgconfig-helper = writeShellScriptBin "pkg-config" ''exec $PKG_CONFIG "$@"'';
+in
+
 stdenv.mkDerivation rec {
   name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}";
   version = "0.7";
@@ -35,7 +40,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs =
     stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]);
 
-  nativeBuildInputs = [ pkgconfig gettext intltool glib ];
+  nativeBuildInputs = [ pkgconfig pkgconfig-helper gettext intltool glib ];
 
   configureFlags =
     [ "--disable-qt3" "--disable-gdbm" "--disable-mono"