diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix index 926187f7374..b52031d4ac6 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg -, libpng, cairo, perl, jasper, xlibs, gdk_pixbuf +{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs +, gdk_pixbuf, xz , xineramaSupport ? true , cupsSupport ? true, cups ? null }: @@ -8,11 +8,12 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.5"; + name = src.pkgname; - src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.bz2"; - sha256 = "f355f26003b1b42b97e584bdc475189a423fdd052088ee4bbd7aa0f989815cc8"; + src = fetchurl_gnome { + project = "gtk+"; + major = "2"; minor = "24"; patchlevel = "6"; extension = "xz"; + sha256 = "1jpgxycxgz1g5yd7spxyc2i8zvn8swm275dkd4d0ryn1bma6n0la"; }; patches = @@ -23,11 +24,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildNativeInputs = [ perl ]; - buildInputs = [ pkgconfig jasper ]; + buildNativeInputs = [ perl pkgconfig xz ]; propagatedBuildInputs = - [ xlibs.xlibs glib atk pango gdk_pixbuf /* libtiff libjpeg libpng */ cairo + [ xlibs.xlibs glib atk pango gdk_pixbuf cairo xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama