GTK-related minor updates

This commit is contained in:
Vladimír Čunát 2013-08-03 09:45:22 +02:00
parent 661a1a68a6
commit d374527509
7 changed files with 31 additions and 23 deletions

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
versionMajor = "2.8";
versionMinor = "0";
versionMinor = "1";
moduleName = "at-spi2-atk";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "085sqww174vl3i9ccb477v706rkjs2d107rl96ma1kbl2jyar226";
sha256 = "01pxfnksixrjj27ivllpla54r6nkwsjj34acb0phmp76zna9nrgb";
};
buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi

View File

@ -11,7 +11,7 @@ rec {
#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
at_spi2_atk = lib.lowPrio (callPackage ./core/at-spi2-atk { });
at_spi2_atk = callPackage ./core/at-spi2-atk { };
at_spi2_core = callPackage ./core/at-spi2-core { };

View File

@ -2,11 +2,11 @@
, jasper, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "gdk-pixbuf-2.28.1";
name = "gdk-pixbuf-2.28.2";
src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/2.28/${name}.tar.xz";
sha256 = "1fy2a05xhfg7gy4l4aajsbmgj62zxhikdxqh6bicihxmzm1vg85y";
sha256 = "05s6ksvy1yan6h6zny9n3bmvygcnzma6ljl6i0z9cci2xg116c8q";
};
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.

View File

@ -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
@ -23,30 +23,41 @@ let
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.3";
src = fetchurl {
url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz";
sha256 = "090bw5par3dfy5m6dhq393pmy92zpw3d7rgbzqjc14jfg637bqvx";
sha256 = "07kn9j0gbh97mmmn72ird628klfdrswx1hqrcr1lqbp0djzk7i2y";
};
# 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 = "--with-pcre=system --disable-fam";
postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h";
postConfigure =
optionalString stdenv.isDarwin (''
sed '24 i #include <Foundation/Foundation.h>'
'' + /* Disable the NeXTstep back-end because stdenv.gcc doesn't support Objective-C. */ ''
sed -i configure -e's/glib_have_cocoa=yes/glib_have_cocoa=no/g'
'');
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 = {
@ -69,4 +80,3 @@ stdenv.mkDerivation rec {
'';
};
}

View File

@ -8,19 +8,16 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null;
stdenv.mkDerivation rec {
name = "gtk+-2.24.18";
name = "gtk+-2.24.20";
src = fetchurl {
url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
sha256 = "1193frzg0qrwa885w77kd055zfpbdjwby88xn2skpx9g4w0k35kc";
sha256 = "18qdvb7nxi25hfnpmcy01p3majw9jnx83ikm263dk9rrjazvqrnc";
};
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"
+ stdenv.lib.optionalString (libintlOrEmpty != []) " -lintl";
buildInputs = stdenv.lib.optional stdenv.isDarwin xlibs.libXi;
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (libintlOrEmpty != []) "-lintl";
nativeBuildInputs = [ perl pkgconfig gettext ];

View File

@ -2,7 +2,7 @@
, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "pango-1.32.5"; #.6 needs a not-yet-stable fontconfig
name = "pango-1.32.5"; #.6 and higher need a not-yet-stable fontconfig (!)
src = fetchurl {
url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz";

View File

@ -4235,6 +4235,7 @@ let
stdenv = if stdenv.isDarwin
then overrideGCC stdenv gccApple
else stdenv;
automake = automake113x;
};
glibmm = callPackage ../development/libraries/glibmm { };