diff options
-rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/glib/2.34.x.nix | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 5716ac6648a..fa06a5269d3 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }: let - version = "1.6.4"; + version = "1.6.8"; src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - sha256 = "1wacqyfkcpayg7f8rvx9awqg275n5pksxq5q7y21lxjx85x6pfjz"; + sha256 = "fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac"; }; patches = [ ./ignore-missing-includedirs.patch ]; diff --git a/pkgs/development/libraries/glib/2.34.x.nix b/pkgs/development/libraries/glib/2.34.x.nix index 69ed44aecca..e11e3bcb317 100644 --- a/pkgs/development/libraries/glib/2.34.x.nix +++ b/pkgs/development/libraries/glib/2.34.x.nix @@ -12,11 +12,11 @@ # $out/bin/gtester-report' to postInstall if this is solved stdenv.mkDerivation (rec { - name = "glib-2.34.0"; + name = "glib-2.34.3"; src = fetchurl { url = "mirror://gnome/sources/glib/2.34/${name}.tar.xz"; - sha256 = "f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144"; + sha256 = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7"; }; # configure script looks for d-bus but it is only needed for tests @@ -26,7 +26,11 @@ stdenv.mkDerivation (rec { propagatedBuildInputs = [ pcre zlib libffi ]; - configureFlags = "--with-pcre=system --disable-fam"; + configureFlags = "--with-pcre=system --disable-fam" + + (stdenv.lib.optionalString (libiconvOrNull != null) " --with-libiconv=gnu") + + (stdenv.lib.optionalString stdenv.isSunOS " --disable-modular-tests"); + + CPPFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-DBSD_COMP"; enableParallelBuilding = true; |