Fixed dbus-glib compilation on FreeBSD
svn path=/nixpkgs/branches/stdenv-updates/; revision=19793
This commit is contained in:
parent
d26683f5a9
commit
318dc53aa3
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0nv4gxcbpa9f0907dmzmfm222w8y45z19cx27l85f5qknf8hncxm";
|
sha256 = "0nv4gxcbpa9f0907dmzmfm222w8y45z19cx27l85f5qknf8hncxm";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [pkgconfig expat gettext];
|
buildInputs = [pkgconfig expat gettext libiconv];
|
||||||
|
|
||||||
propagatedBuildInputs = [dbus.libs glib];
|
propagatedBuildInputs = [dbus.libs glib];
|
||||||
|
|
||||||
|
|
|
@ -3419,6 +3419,7 @@ let
|
||||||
|
|
||||||
dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) {
|
dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) {
|
||||||
inherit fetchurl stdenv pkgconfig gettext dbus expat glib;
|
inherit fetchurl stdenv pkgconfig gettext dbus expat glib;
|
||||||
|
libiconv = if (stdenv.system == "i686-freebsd") then libiconv else null;
|
||||||
};
|
};
|
||||||
|
|
||||||
dbus_java = import ../development/libraries/java/dbus-java {
|
dbus_java = import ../development/libraries/java/dbus-java {
|
||||||
|
|
Loading…
Reference in New Issue