From d374527509657cfeb8499118b26e7605fab8f4d2 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 3 Aug 2013 09:45:22 +0200 Subject: GTK-related minor updates --- pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix | 4 +-- pkgs/desktops/gnome-3/default.nix | 2 +- pkgs/development/libraries/gdk-pixbuf/default.nix | 4 +-- pkgs/development/libraries/glib/default.nix | 32 ++++++++++++++-------- pkgs/development/libraries/gtk+/2.x.nix | 9 ++---- pkgs/development/libraries/pango/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 7 files changed, 31 insertions(+), 23 deletions(-) (limited to 'pkgs') diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix index 948774572670..ab25845c413d 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix @@ -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 diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 5d517da82b39..a5f230ae32ca 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -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 { }; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 3a22bb4c3c1a..fabc009e3ef3 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -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. diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index b5e2b1e43b21..6c53e573bf66 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 @@ -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 ' + '' + /* 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 { ''; }; } - diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 6debf2a807b3..92463d80c2bd 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -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 ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 1acb3639f065..cec3d1dccc00 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 938d107a43e7..539a862138f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4235,6 +4235,7 @@ let stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple else stdenv; + automake = automake113x; }; glibmm = callPackage ../development/libraries/glibmm { }; -- cgit 1.4.1