From 4289cff0c29e4bd777729369985301480d5b3199 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 11 Oct 2011 20:47:30 +0000 Subject: [PATCH] Remove gtkLibs216.*mm svn path=/nixpkgs/trunk/; revision=29774 --- pkgs/development/libraries/glibmm/2.18.x.nix | 21 ------------- pkgs/development/libraries/gtkmm/2.14.x.nix | 31 ------------------- pkgs/development/libraries/pangomm/2.14.x.nix | 28 ----------------- pkgs/top-level/all-packages.nix | 6 ---- 4 files changed, 86 deletions(-) delete mode 100644 pkgs/development/libraries/glibmm/2.18.x.nix delete mode 100644 pkgs/development/libraries/gtkmm/2.14.x.nix delete mode 100644 pkgs/development/libraries/pangomm/2.14.x.nix diff --git a/pkgs/development/libraries/glibmm/2.18.x.nix b/pkgs/development/libraries/glibmm/2.18.x.nix deleted file mode 100644 index b5f8ebf7eb11..000000000000 --- a/pkgs/development/libraries/glibmm/2.18.x.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }: - -stdenv.mkDerivation rec { - name = "glibmm-2.18.1"; - - src = fetchurl { - url = "mirror://gnome/sources/glibmm/2.18/${name}.tar.bz2"; - sha256 = "0jg65hv6pwxqk4fabsjjz2zwn5hb6rgy3szj956avliarbliyr3r"; - }; - - buildInputs = [pkgconfig]; - propagatedBuildInputs = [glib libsigcxx]; - - meta = { - description = "C++ interface to the GLib library"; - - homepage = http://gtkmm.org/; - - license = "LGPLv2+"; - }; -} diff --git a/pkgs/development/libraries/gtkmm/2.14.x.nix b/pkgs/development/libraries/gtkmm/2.14.x.nix deleted file mode 100644 index 74b234d8e4b6..000000000000 --- a/pkgs/development/libraries/gtkmm/2.14.x.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, cairomm, pangomm }: - -stdenv.mkDerivation rec { - name = "gtkmm-2.14.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkmm/2.14/${name}.tar.bz2"; - sha256 = "18jral2lv9jv02d3balh0mi0wgbqhrz5y2laclri1skccc2q3c94"; - }; - - buildInputs = [pkgconfig]; - propagatedBuildInputs = [ glibmm gtk atk cairomm pangomm ]; - - meta = { - description = "C++ interface to the GTK+ graphical user interface library"; - - longDescription = '' - gtkmm is the official C++ interface for the popular GUI library - GTK+. Highlights include typesafe callbacks, and a - comprehensive set of widgets that are easily extensible via - inheritance. You can create user interfaces either in code or - with the Glade User Interface designer, using libglademm. - There's extensive documentation, including API reference and a - tutorial. - ''; - - homepage = http://gtkmm.org/; - - license = "LGPLv2+"; - }; -} diff --git a/pkgs/development/libraries/pangomm/2.14.x.nix b/pkgs/development/libraries/pangomm/2.14.x.nix deleted file mode 100644 index 346962c5eaa4..000000000000 --- a/pkgs/development/libraries/pangomm/2.14.x.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }: - -stdenv.mkDerivation rec { - name = "pangomm-2.14.1"; - - src = fetchurl { - url = "mirror://gnome/sources/pangomm/2.14/${name}.tar.bz2"; - sha256 = "0mrm5hv8kb84qzb97lqbipzzc8g0b97pfgz2hqq33xs2ha3lswnp"; - }; - - buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pango glibmm cairomm libpng ]; - - meta = { - description = "C++ interface to the Pango text rendering library"; - - 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+"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64032e899ce7..fbc273306145 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3537,20 +3537,14 @@ let glib = callPackage ../development/libraries/glib/2.20.x.nix { }; - glibmm = callPackage ../development/libraries/glibmm/2.18.x.nix { }; - atk = callPackage ../development/libraries/atk/1.24.x.nix { }; cairo = callPackage ../development/libraries/cairo { }; pango = callPackage ../development/libraries/pango/1.24.x.nix { }; - pangomm = callPackage ../development/libraries/pangomm/2.14.x.nix { }; - gtk = callPackage ../development/libraries/gtk+/2.16.x.nix { }; - gtkmm = callPackage ../development/libraries/gtkmm/2.14.x.nix { }; - }); gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in {