From 598199c93d20c2ec16175c43d98bdeb1c064b02d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 3 Feb 2008 13:17:25 +0000 Subject: [PATCH] Removed unused gtkLibs28 svn path=/nixpkgs/branches/stdenv-updates/; revision=10474 --- .../libraries/gtk-libs/2.8/atk/default.nix | 13 ---------- .../libraries/gtk-libs/2.8/default.nix | 26 ------------------- .../libraries/gtk-libs/2.8/glib/default.nix | 13 ---------- .../libraries/gtk-libs/2.8/glibmm/default.nix | 12 --------- .../libraries/gtk-libs/2.8/gtk+/default.nix | 22 ---------------- .../libraries/gtk-libs/2.8/gtkmm/default.nix | 12 --------- .../libraries/gtk-libs/2.8/pango/default.nix | 13 ---------- pkgs/top-level/all-packages.nix | 7 ----- 8 files changed, 118 deletions(-) delete mode 100644 pkgs/development/libraries/gtk-libs/2.8/atk/default.nix delete mode 100644 pkgs/development/libraries/gtk-libs/2.8/default.nix delete mode 100644 pkgs/development/libraries/gtk-libs/2.8/glib/default.nix delete mode 100644 pkgs/development/libraries/gtk-libs/2.8/glibmm/default.nix delete mode 100644 pkgs/development/libraries/gtk-libs/2.8/gtk+/default.nix delete mode 100644 pkgs/development/libraries/gtk-libs/2.8/gtkmm/default.nix delete mode 100644 pkgs/development/libraries/gtk-libs/2.8/pango/default.nix diff --git a/pkgs/development/libraries/gtk-libs/2.8/atk/default.nix b/pkgs/development/libraries/gtk-libs/2.8/atk/default.nix deleted file mode 100644 index 07537567520..00000000000 --- a/pkgs/development/libraries/gtk-libs/2.8/atk/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, perl}: - -assert pkgconfig != null && glib != null && perl != null; - -stdenv.mkDerivation { - name = "atk-1.10.3"; - src = fetchurl { - url = ftp://ftp.gtk.org/pub/gtk/v2.8/atk-1.10.3.tar.bz2; - md5 = "c84a01fea567b365c0d44b227fead948"; - }; - buildInputs = [pkgconfig perl]; - propagatedBuildInputs = [glib]; -} diff --git a/pkgs/development/libraries/gtk-libs/2.8/default.nix b/pkgs/development/libraries/gtk-libs/2.8/default.nix deleted file mode 100644 index ee5abd562b1..00000000000 --- a/pkgs/development/libraries/gtk-libs/2.8/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ xineramaSupport ? false -, stdenv, fetchurl, pkgconfig, gettext, perl, x11 -, libtiff, libjpeg, libpng, cairo, libXinerama ? null -}: - -rec { - - glib = (import ./glib) { - inherit fetchurl stdenv pkgconfig gettext perl; - }; - - atk = (import ./atk) { - inherit fetchurl stdenv pkgconfig glib perl; - }; - - pango = (import ./pango) { - inherit fetchurl stdenv pkgconfig glib x11 cairo; - }; - - gtk = (import ./gtk+) { - inherit fetchurl stdenv pkgconfig glib atk pango perl - libtiff libjpeg libpng x11 cairo libXinerama - xineramaSupport; - }; - -} diff --git a/pkgs/development/libraries/gtk-libs/2.8/glib/default.nix b/pkgs/development/libraries/gtk-libs/2.8/glib/default.nix deleted file mode 100644 index f73a1f388f4..00000000000 --- a/pkgs/development/libraries/gtk-libs/2.8/glib/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, gettext, perl}: - -assert pkgconfig != null && gettext != null && perl != null; - -stdenv.mkDerivation { - name = "glib-2.10.3"; - src = fetchurl { - url = ftp://ftp.gtk.org/pub/glib/2.10/glib-2.10.3.tar.bz2; - md5 = "87206e721c12d185d17dd9ecd7e30369"; - }; - buildInputs = [pkgconfig perl]; - propagatedBuildInputs = [gettext]; -} diff --git a/pkgs/development/libraries/gtk-libs/2.8/glibmm/default.nix b/pkgs/development/libraries/gtk-libs/2.8/glibmm/default.nix deleted file mode 100644 index 957c596fc7b..00000000000 --- a/pkgs/development/libraries/gtk-libs/2.8/glibmm/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, libsigcxx}: - -stdenv.mkDerivation { - name = "glibmm-2.6.4"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.6/glibmm-2.6.1.tar.bz2; - md5 = "e37da352bf581503c5866f0231fd4a74"; - }; - - buildInputs = [pkgconfig glib libsigcxx]; -} - diff --git a/pkgs/development/libraries/gtk-libs/2.8/gtk+/default.nix b/pkgs/development/libraries/gtk-libs/2.8/gtk+/default.nix deleted file mode 100644 index c5a012d9baa..00000000000 --- a/pkgs/development/libraries/gtk-libs/2.8/gtk+/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ xineramaSupport ? false -, stdenv, fetchurl, pkgconfig, x11, glib, atk -, pango, perl, libtiff, libjpeg, libpng, cairo, libXinerama ? null -}: - -assert x11.buildClientLibs; -assert xineramaSupport -> libXinerama != null; - - -stdenv.mkDerivation { - name = "gtk+-2.8.20"; - src = fetchurl { - url = ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.20.tar.bz2; - md5 = "74e7ca98194f1fadfe906e66d763d05d"; - }; - buildInputs = [ - pkgconfig perl libtiff libjpeg libpng cairo - (if xineramaSupport then libXinerama else null) - ]; - propagatedBuildInputs = [x11 glib atk pango]; - inherit libtiff libjpeg libpng; -} diff --git a/pkgs/development/libraries/gtk-libs/2.8/gtkmm/default.nix b/pkgs/development/libraries/gtk-libs/2.8/gtkmm/default.nix deleted file mode 100644 index ebc1e881c47..00000000000 --- a/pkgs/development/libraries/gtk-libs/2.8/gtkmm/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, libsigcxx}: - -stdenv.mkDerivation { - name = "gtkmm-2.6.4"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.6/gtkmm-2.6.4.tar.bz2; - md5 = "f71d1c4a89c4f9e054400f12a82dec5f"; - }; - - buildInputs = [pkgconfig gtk atk glibmm libsigcxx]; -} - diff --git a/pkgs/development/libraries/gtk-libs/2.8/pango/default.nix b/pkgs/development/libraries/gtk-libs/2.8/pango/default.nix deleted file mode 100644 index 9e3296e00a1..00000000000 --- a/pkgs/development/libraries/gtk-libs/2.8/pango/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, x11, glib, cairo}: - -assert x11.buildClientLibs; - -stdenv.mkDerivation { - name = "pango-1.12.4"; - src = fetchurl { - url = ftp://ftp.gtk.org/pub/pango/1.12/pango-1.12.4.tar.bz2; - md5 = "8f6749fe961e41dbeed72d1efcd55224"; - }; - buildInputs = [pkgconfig]; - propagatedBuildInputs = [x11 glib cairo]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2ead2f6a33..0c5bf384132 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2007,13 +2007,6 @@ rec { libtiff libjpeg libpng; }; - gtkLibs28 = import ../development/libraries/gtk-libs/2.8 { - inherit fetchurl stdenv pkgconfig gettext perl x11 - libtiff libjpeg libpng cairo; - inherit (xlibs) libXinerama; - xineramaSupport = true; - }; - gtkmm = import ../development/libraries/gtk-libs/2.6/gtkmm { inherit fetchurl stdenv pkgconfig libsigcxx; inherit (gtkLibs26) gtk atk;