diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-09-02 15:44:57 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-09-02 15:44:57 +0200 |
commit | 74488e2b586b87b8327b091f2b61e889c6c69e1f (patch) | |
tree | 1fba42b891983c7fe58a993201a00243d46288c8 /pkgs/development/libraries/glib | |
parent | ed507d70bc645461b78180b256b074955b30fc55 (diff) | |
parent | 0fc3e2817a1d4d20aed4617f41cdb84f93d1e021 (diff) |
Merge branch 'x-updates' into stdenv-updates
Conflicts (simple): pkgs/development/libraries/glib/default.nix pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'pkgs/development/libraries/glib')
-rw-r--r-- | pkgs/development/libraries/glib/default.nix | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 01b6795c48648..97ad7da16260d 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrEmpty, zlib, libffi -, python, pcre, libelf, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, gettext, perl, python, autoconf, automake, libtool +, libiconvOrEmpty, libintlOrEmpty, zlib, libffi, pcre, libelf, dbus }: # TODO: # * Add gio-module-fam @@ -12,43 +12,50 @@ # $out/bin/gtester-report' to postInstall if this is solved let - # some packages don't get "Cflags" from pkgconfig correctly - # and then fail to build when directly including like <glib/...> + # Some packages don't get "Cflags" from pkgconfig correctly + # and then fail to build when directly including like <glib/...>. + # This is intended to be run in postInstall of any package + # which has $out/include/ containing just some disjunct directories. flattenInclude = '' - for dir in $out/include/*; do - cp -r $dir/* "$out/include/" + for dir in "$out"/include/*; do + cp -r "$dir"/* "$out/include/" rm -r "$dir" ln -s . "$dir" done - ln -sr -t "$out/include/" $out/lib/*/include/* 2>/dev/null || true + ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true ''; in +with { inherit (stdenv.lib) optionalString; }; stdenv.mkDerivation rec { - name = "glib-2.36.1"; + name = "glib-2.36.4"; src = fetchurl { url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz"; - sha256 = "090bw5par3dfy5m6dhq393pmy92zpw3d7rgbzqjc14jfg637bqvx"; + sha256 = "0zmdbkg2yjyxdl72w34lxvrssbzqzdficskkfn22s0994dad4m7n"; }; - # configure script looks for d-bus but it is only needed for tests - buildInputs = [ libelf ] ++ libintlOrEmpty; + # configure script looks for d-bus but it is (probably) only needed for tests + buildInputs = [ libelf ]; - nativeBuildInputs = [ perl pkgconfig gettext python ]; + # I don't know why the autotools are needed now, even without modifying configure scripts + nativeBuildInputs = [ pkgconfig gettext perl python ] ++ [ autoconf automake libtool ]; - propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty; + propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty ++ libintlOrEmpty; + + preConfigure = "autoreconf -fi"; configureFlags = stdenv.lib.optional stdenv.isSunOS "--disable-modular-tests"; CPPFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-DBSD_COMP"; - postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h"; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-lintl"; enableParallelBuilding = true; + doCheck = false; # ToDo: fix the remaining problems, so we have checked glib by default + LD_LIBRARY_PATH = optionalString doCheck "${stdenv.gcc.gcc}/lib"; + postInstall = ''rm -rvf $out/share/gtk-doc''; passthru = { @@ -71,4 +78,3 @@ stdenv.mkDerivation rec { ''; }; } - |