public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use pango-1.29

Browse Source 
svn path=/nixpkgs/trunk/; revision=32935
This commit is contained in:
Yury G. Kudryashov 2012-03-08 23:25:52 +00:00
parent a5eb37cc37
commit b0aa85371b
3 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gtk+/3.2.x.nix
View File

@ -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 , gdk_pixbuf, xz
, xineramaSupport ? true , xineramaSupport ? true
, cupsSupport ? true, cups ? null , cupsSupport ? true, cups ? null
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildNativeInputs = [ perl pkgconfig ]; buildNativeInputs = [ perl pkgconfig ];
propagatedBuildInputs = 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 xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
] ]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama

37
pkgs/development/libraries/pango/1.28.x.nix
View File

@ -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;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -3727,7 +3727,7 @@ let
cairo = callPackage ../development/libraries/cairo { }; 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 { }; pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
@ -3739,8 +3739,6 @@ let
gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; 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 { }); gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {