From b0aa85371bc43d681d39b5d51b5f313f192018ae Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" <urkud.urkud@gmail.com> Date: Thu, 8 Mar 2012 23:25:52 +0000 Subject: [PATCH] Use pango-1.29 svn path=/nixpkgs/trunk/; revision=32935 --- pkgs/development/libraries/gtk+/3.2.x.nix | 4 +-- pkgs/development/libraries/pango/1.28.x.nix | 37 --------------------- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 pkgs/development/libraries/pango/1.28.x.nix diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix index 1fbd7f739362..df59c0176260 100644 --- a/pkgs/development/libraries/gtk+/3.2.x.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, atk, pango129, cairo, perl, xlibs +{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs , gdk_pixbuf, xz , xineramaSupport ? true , cupsSupport ? true, cups ? null @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ perl pkgconfig ]; propagatedBuildInputs = - [ xlibs.xlibs glib atk pango129 gdk_pixbuf cairo + [ xlibs.xlibs glib atk pango gdk_pixbuf cairo xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama diff --git a/pkgs/development/libraries/pango/1.28.x.nix b/pkgs/development/libraries/pango/1.28.x.nix deleted file mode 100644 index 7c6119b5a864..000000000000 --- a/pkgs/development/libraries/pango/1.28.x.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng }: - -stdenv.mkDerivation rec { - name = src.pkgname; - - src = fetchurl_gnome { - project = "pango"; - major = "1"; minor = "28"; patchlevel = "4"; - sha256 = "17ssy12pqs2s0d89zyhwmkcrbpip6jyf5m8ll9libl0dq6y3bc3y"; - }; - - buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; - - buildNativeInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ x11 glib cairo libpng ]; - - postInstall = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "A library for laying out and rendering of text, with an emphasis on internationalization"; - - longDescription = '' - Pango is a library for laying out and rendering of text, with an - emphasis on internationalization. Pango can be used anywhere - that text layout is needed, though most of the work on Pango so - far has been done in the context of the GTK+ widget toolkit. - Pango forms the core of text and font handling for GTK+-2.x. - ''; - - homepage = http://www.pango.org/; - license = "LGPLv2+"; - - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eeab8e54fc41..a061aa18e3c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3727,7 +3727,7 @@ let cairo = callPackage ../development/libraries/cairo { }; - pango = callPackage ../development/libraries/pango/1.28.x.nix { }; + pango = callPackage ../development/libraries/pango/1.29.x.nix { }; pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; @@ -3739,8 +3739,6 @@ let gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; - pango129 = lowPrio (callPackage ../development/libraries/pango/1.29.x.nix { }); - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {