diff options
| -rw-r--r-- | pkgs/development/libraries/atk/1.28.x.nix | 33 | ||||
| -rw-r--r-- | pkgs/development/libraries/cairo/1.10.nix | 60 | ||||
| -rw-r--r-- | pkgs/development/libraries/glib/2.22.x.nix | 36 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk+/2.18.x.nix | 49 | ||||
| -rw-r--r-- | pkgs/development/libraries/pango/1.26.x.nix | 32 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 25 |
6 files changed, 1 insertions, 234 deletions
diff --git a/pkgs/development/libraries/atk/1.28.x.nix b/pkgs/development/libraries/atk/1.28.x.nix deleted file mode 100644 index 753f8c59c87..00000000000 --- a/pkgs/development/libraries/atk/1.28.x.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib }: - -stdenv.mkDerivation rec { - name = "atk-1.28.0"; - - src = fetchurl { - url = "mirror://gnome/sources/atk/1.28/${name}.tar.bz2"; - sha256 = "11zyamivv7fcj9ap3w3bn3gm89mkni9waf51fx75zmfjh3jrznp4"; - }; - - buildInputs = [pkgconfig perl]; - propagatedBuildInputs = [glib]; - - meta = { - description = "ATK, the accessibility toolkit"; - - longDescription = '' - ATK is the Accessibility Toolkit. It provides a set of generic - interfaces allowing accessibility technologies such as screen - readers to interact with a graphical user interface. Using the - ATK interfaces, accessibility tools have full access to view and - control running applications. - ''; - - homepage = http://library.gnome.org/devel/atk/; - - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; - -} diff --git a/pkgs/development/libraries/cairo/1.10.nix b/pkgs/development/libraries/cairo/1.10.nix deleted file mode 100644 index f1eaf65e69c..00000000000 --- a/pkgs/development/libraries/cairo/1.10.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ postscriptSupport ? true -, pdfSupport ? true -, pngSupport ? true -, xcbSupport ? false -, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype -, zlib, libpng, pixman, libxcb ? null, xcbutil ? null -}: - -assert postscriptSupport -> zlib != null; -assert pngSupport -> libpng != null; -assert xcbSupport -> libxcb != null && xcbutil != null; - -stdenv.mkDerivation rec { - name = "cairo-1.10.0"; - - src = fetchurl { - url = "http://cairographics.org/releases/${name}.tar.gz"; - sha256 = "1cllxp8rx5zxkfpn36ysqg1kqz5d1cvbbf2fsy440n8m8v6f8b0g"; - }; - - buildInputs = - [ pkgconfig x11 fontconfig pixman ] ++ - stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]; - - propagatedBuildInputs = - [ freetype ] ++ - stdenv.lib.optional postscriptSupport zlib ++ - stdenv.lib.optional pngSupport libpng; - - configureFlags = - stdenv.lib.optional xcbSupport "--enable-xcb" ++ - stdenv.lib.optional pdfSupport "--enable-pdf"; - - preConfigure = '' - # Work around broken `Requires.private' that prevents Freetype - # `-I' flags to be propagated. - sed -i "src/cairo.pc.in" \ - -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' - ''; - - meta = { - description = "A 2D graphics library with support for multiple output devices"; - - longDescription = '' - Cairo is a 2D graphics library with support for multiple output - devices. Currently supported output targets include the X - Window System, Quartz, Win32, image buffers, PostScript, PDF, - and SVG file output. Experimental backends include OpenGL - (through glitz), XCB, BeOS, OS/2, and DirectFB. - - Cairo is designed to produce consistent output on all output - media while taking advantage of display hardware acceleration - when available (e.g., through the X Render Extension). - ''; - - homepage = http://cairographics.org/; - - licenses = [ "LGPLv2+" "MPLv1" ]; - }; -} diff --git a/pkgs/development/libraries/glib/2.22.x.nix b/pkgs/development/libraries/glib/2.22.x.nix deleted file mode 100644 index f9129f7ae4a..00000000000 --- a/pkgs/development/libraries/glib/2.22.x.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv}: - -stdenv.mkDerivation rec { - name = "glib-2.22.5"; - - src = fetchurl { - url = "mirror://gnome/sources/glib/2.22/${name}.tar.bz2"; - sha256 = "802be9c9ffeb631725ffd6ed35af0af309776729a7fab4fcb48f2b0b8fe7245b"; - }; - - buildInputs = [pkgconfig gettext perl] - ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; - - # The nbd package depends on a static version of this library; hence - # the default configure flag --disable-static is switched off. - dontDisableStatic = true; - configureFlags = "--enable-static --enable-shared"; - - meta = { - description = "GLib, a C library of programming buildings blocks"; - - longDescription = '' - GLib provides the core application building blocks for libraries - and applications written in C. It provides the core object - system used in GNOME, the main loop implementation, and a large - set of utility functions for strings and common data structures. - ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gtk+/2.18.x.nix b/pkgs/development/libraries/gtk+/2.18.x.nix deleted file mode 100644 index 40ba6e13b22..00000000000 --- a/pkgs/development/libraries/gtk+/2.18.x.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg -, libpng, cairo, perl, jasper, xlibs -, xineramaSupport ? true -, cupsSupport ? true, cups ? null -}: - -assert xineramaSupport -> xlibs.libXinerama != null; -assert cupsSupport -> cups != null; - -stdenv.mkDerivation rec { - name = "gtk+-2.18.9"; - - src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.18/${name}.tar.bz2"; - sha256 = "5dcd8c406acbb8779c0b081a089fa87dfd7ab4d7d4c6075db478997ce96aa9b4"; - }; - - buildNativeInputs = [ perl ]; - buildInputs = [ pkgconfig jasper ]; - - propagatedBuildInputs = - [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ] - ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama - ++ stdenv.lib.optionals cupsSupport [ cups ]; - - passthru = { inherit libtiff libjpeg libpng; }; - - meta = { - description = "A multi-platform toolkit for creating graphical user interfaces"; - - longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating - graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, - but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed - under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or - royalties. - ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/pango/1.26.x.nix b/pkgs/development/libraries/pango/1.26.x.nix deleted file mode 100644 index fb24cb544b0..00000000000 --- a/pkgs/development/libraries/pango/1.26.x.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: - -stdenv.mkDerivation rec { - name = "pango-1.26.2"; - - src = fetchurl { - url = "mirror://gnome/sources/pango/1.26/${name}.tar.bz2"; - sha256 = "021ygk3l9bk00gsvxk02flxsk68w0wl99dx221fmb547bng8g19v"; - }; - - buildInputs = [pkgconfig] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext; - - 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+"; - - 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 c2a83a12180..9da5290ec21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2797,9 +2797,6 @@ let buddy = callPackage ../development/libraries/buddy { }; cairo = callPackage ../development/libraries/cairo { }; - cairo_1_10_0 = callPackage ../development/libraries/cairo/1.10.nix { - pixman = xlibs.pixman_0_20_0; - }; cairomm = callPackage ../development/libraries/cairomm { }; @@ -3220,24 +3217,6 @@ let }); - gtkLibs218 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs218; in rec { - - glib = callPackage ../development/libraries/glib/2.22.x.nix { }; - - glibmm = callPackage ../development/libraries/glibmm/2.22.x.nix { }; - - atk = callPackage ../development/libraries/atk/1.28.x.nix { }; - - pango = callPackage ../development/libraries/pango/1.26.x.nix { }; - - pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { }; - - gtk = callPackage ../development/libraries/gtk+/2.18.x.nix { }; - - gtkmm = callPackage ../development/libraries/gtkmm/2.18.x.nix { }; - - }); - gtkLibs220 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs220; in rec { glib = callPackage ../development/libraries/glib/2.24.x.nix { }; @@ -5933,9 +5912,7 @@ let inherit (gnome) libIDL; }; - firefox40Pkgs = let p = (applyGlobalOverrides (x : {cairo = x.cairo_1_10_0;})); - in p.callPackage - ../applications/networking/browsers/firefox/4.0.nix { + firefox40Pkgs = callPackage ../applications/networking/browsers/firefox/4.0.nix { inherit (p.gtkLibs) gtk pango; inherit (p.gnome) libIDL; }; |