svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=31386

1 files changed, 0 insertions, 29 deletions

diff --git a/pkgs/development/libraries/pango/1.24.x.nix b/pkgs/development/libraries/pango/1.24.x.nix
deleted file mode 100644
index b2e61e6cae4e..000000000000
--- a/pkgs/development/libraries/pango/1.24.x.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
-
-stdenv.mkDerivation rec {
-  name = "pango-1.24.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/pango/1.24/${name}.tar.bz2";
-    sha256 = "1cls9cbk6sx81101gh2pkiri8v14shqpvy37cydbh8scs4yk8370";
-  };
-
-  buildInputs = [pkgconfig] ++ (if stdenv.system == "i686-darwin" then [gettext] else []);
-
-  propagatedBuildInputs = [x11 glib cairo libpng];
-
-  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+";
-  };
-}