diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gtk/2.x.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gtk/2.x.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index 1a7cc57fbeaf..396366324d3a 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -4,7 +4,7 @@ , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa -, fetchpatch +, fetchpatch, buildPackages }: with lib; @@ -21,11 +21,11 @@ in stdenv.mkDerivation rec { pname = "gtk+"; - version = "2.24.32"; + version = "2.24.33"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz"; - sha256 = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e"; + sha256 = "rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { gtkCleanImmodulesCache ]; + nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ]; patches = [ @@ -72,6 +73,9 @@ stdenv.mkDerivation rec { "--disable-glibtest" "--disable-introspection" "--disable-visibility" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "ac_cv_path_GTK_UPDATE_ICON_CACHE=${buildPackages.gtk2}/bin/gtk-update-icon-cache" + "ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource" ]; doCheck = false; # needs X11 |