Author: urkud
Date: Thu Mar 29 14:29:50 2012
New Revision: 33472
URL: https://nixos.org/websvn/nix/?rev=33472&sc=1
Log:
glib-2.30.3
Build with system pcre.
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/glib/2.30.x.nix
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/glib/2.30.x.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/glib/2.30.x.nix
Thu Mar 29 13:39:55 2012 (r33471)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/glib/2.30.x.nix
Thu Mar 29 14:29:50 2012 (r33472)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi
-, python }:
+, python, pcre }:
# TODO:
# * Add gio-module-fam
@@ -12,22 +12,23 @@
# $out/bin/gtester-report' to postInstall if this is solved
stdenv.mkDerivation rec {
- name = "glib-2.30.2";
+ name = "glib-2.30.3";
src = fetchurl {
- url = mirror://gnome/sources/glib/2.30/glib-2.30.2.tar.xz;
- sha256 = "10lfzxwc45lh5vfnd33l4m9z1mf3arpwdd8jz94dn79j6diixsgh";
+ url = mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz;
+ sha256 = "09yxfajynbw78kji48z384lylp67kihfi1g78qrrjif4f5yb5jz6";
};
# configure script looks for d-bus but it is only needed for tests
- buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
+ buildInputs = [ pcre ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
buildNativeInputs = [ perl pkgconfig gettext python ];
propagatedBuildInputs = [ zlib libffi ];
+ configureFlags = "--with-pcre=system --disable-fam";
+
passthru.gioModuleDir = "lib/gio/modules";
- # glib buildsystem fails to find python, thus hardcodes python2.4 in #!
postInstall = ''rm -rvf $out/share/gtk-doc'';
meta = {
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
