public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glib: minor update and patch malloc usage

Browse Source 
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
This commit is contained in:
Vladimír Čunát 2013-04-29 11:29:18 +02:00
parent 8a1392bd70
commit fe8c1c4118
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/glib/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrNull, zlib, libffi { stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrEmpty, zlib, libffi
, python, pcre, libelf }: , python, pcre, libelf }:
# TODO: # TODO:
@ -25,15 +25,15 @@ let
in in
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "glib-2.36.0"; name = "glib-2.36.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz"; 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 # configure script looks for d-bus but it is only needed for tests
buildInputs = [ libiconvOrNull libelf ]; buildInputs = [ libelf ] ++ libiconvOrEmpty;
nativeBuildInputs = [ perl pkgconfig gettext python ]; nativeBuildInputs = [ perl pkgconfig gettext python ];
@ -41,6 +41,8 @@ stdenv.mkDerivation (rec {
configureFlags = "--with-pcre=system --disable-fam"; 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; enableParallelBuilding = true;
postInstall = ''rm -rvf $out/share/gtk-doc''; postInstall = ''rm -rvf $out/share/gtk-doc'';