avahi: fix cross
This commit is contained in:
parent
c33ca7c5ce
commit
65a5313de5
@ -1,5 +1,5 @@
|
|||||||
{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages
|
{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages
|
||||||
, expat, gettext, intltool, glib, libiconv
|
, expat, gettext, intltool, glib, libiconv, writeShellScriptBin
|
||||||
, gtk3Support ? false, gtk3 ? null
|
, gtk3Support ? false, gtk3 ? null
|
||||||
, qt4 ? null
|
, qt4 ? null
|
||||||
, qt4Support ? false
|
, qt4Support ? false
|
||||||
@ -9,6 +9,11 @@
|
|||||||
|
|
||||||
assert qt4Support -> qt4 != null;
|
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 {
|
stdenv.mkDerivation rec {
|
||||||
name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}";
|
name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}";
|
||||||
version = "0.7";
|
version = "0.7";
|
||||||
@ -35,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||||||
propagatedBuildInputs =
|
propagatedBuildInputs =
|
||||||
stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]);
|
stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]);
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig gettext intltool glib ];
|
nativeBuildInputs = [ pkgconfig pkgconfig-helper gettext intltool glib ];
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[ "--disable-qt3" "--disable-gdbm" "--disable-mono"
|
[ "--disable-qt3" "--disable-gdbm" "--disable-mono"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user