diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/development/libraries/avahi | |
parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/avahi')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/avahi/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/avahi/default.nix b/nixpkgs/pkgs/development/libraries/avahi/default.nix index 4c7e5321f555..3f36b87af704 100644 --- a/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/nixpkgs/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"; @@ -18,6 +23,11 @@ stdenv.mkDerivation rec { sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"; }; + prePatch = '' + substituteInPlace configure \ + --replace pkg-config "$PKG_CONFIG" + ''; + patches = [ ./no-mkdir-localstatedir.patch (fetchpatch { @@ -35,7 +45,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" |