glib: minor update and patch malloc usage

It's mainly a work-around to make skype work again.
It also seems to stabilize xfce4-session crashes (on my setup)
https://bugzilla.xfce.org/show_bug.cgi?id=9709

1 files changed, 6 insertions, 4 deletions

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 20b5ce52bc7cc..47d8d9433245f 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrNull, zlib, libffi
+{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrEmpty, zlib, libffi
 , python, pcre, libelf }:
 
 # TODO:
@@ -25,15 +25,15 @@ let
 in
 
 stdenv.mkDerivation (rec {
-  name = "glib-2.36.0";
+  name = "glib-2.36.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz";
-    sha256 = "09xjkg5kaz4j0m25jizvz7ra48bmdawibykzri5igicjhsz8lnj5";
+    sha256 = "090bw5par3dfy5m6dhq393pmy92zpw3d7rgbzqjc14jfg637bqvx";
   };
 
   # configure script looks for d-bus but it is only needed for tests
-  buildInputs = [ libiconvOrNull libelf ];
+  buildInputs = [ libelf ] ++ libiconvOrEmpty;
 
   nativeBuildInputs = [ perl pkgconfig gettext python ];
 
@@ -41,6 +41,8 @@ stdenv.mkDerivation (rec {
 
   configureFlags = "--with-pcre=system --disable-fam";
 
+  postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h"; # https://bugzilla.gnome.org/show_bug.cgi?id=698716 :-)
+
   enableParallelBuilding = true;
 
   postInstall = ''rm -rvf $out/share/gtk-doc'';