diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-28 13:06:07 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-28 13:06:07 +0000 |
| commit | 9d67ff2a4830343197378dc84e8dec93d941c4b9 (patch) | |
| tree | 8f2a2591439946751f88518c14d3d808addc837f /pkgs/development | |
| parent | 4b36b6132ff2de7a758b51eeae2c529a2edff0f9 (diff) | |
| download | nixlib-9d67ff2a4830343197378dc84e8dec93d941c4b9.tar nixlib-9d67ff2a4830343197378dc84e8dec93d941c4b9.tar.gz nixlib-9d67ff2a4830343197378dc84e8dec93d941c4b9.tar.bz2 nixlib-9d67ff2a4830343197378dc84e8dec93d941c4b9.tar.lz nixlib-9d67ff2a4830343197378dc84e8dec93d941c4b9.tar.xz nixlib-9d67ff2a4830343197378dc84e8dec93d941c4b9.tar.zst nixlib-9d67ff2a4830343197378dc84e8dec93d941c4b9.zip | |
Remove glib-1.x and its reverse dependencies
Nobody told me that he uses generator or xmms, so I'm removing this old stuff. svn path=/nixpkgs/trunk/; revision=31907
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/glib/1.2.x.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/glib/gcc34.patch | 20 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk+/1.2.x.nix | 12 |
3 files changed, 0 insertions, 44 deletions
diff --git a/pkgs/development/libraries/glib/1.2.x.nix b/pkgs/development/libraries/glib/1.2.x.nix deleted file mode 100644 index 8aa5005b6171..000000000000 --- a/pkgs/development/libraries/glib/1.2.x.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "glib-1.2.10"; - src = fetchurl { - url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz; - md5 = "6fe30dad87c77b91b632def29dd69ef9"; - }; - # Patch for gcc 3.4 compatibility. Based on - # http://cvs.openpkg.org/chngview?cn=16208. - patches = [./gcc34.patch]; -} diff --git a/pkgs/development/libraries/glib/gcc34.patch b/pkgs/development/libraries/glib/gcc34.patch deleted file mode 100644 index 13d35c822099..000000000000 --- a/pkgs/development/libraries/glib/gcc34.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc glib-orig/glib.h glib-1.2.10/glib.h -*** glib-orig/glib.h 2001-02-27 04:44:38.000000000 +0100 ---- glib-1.2.10/glib.h 2004-09-22 10:22:01.000000000 +0200 -*************** -*** 272,278 **** - /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with - * macros, so we can refer to them as strings unconditionally. - */ -! #ifdef __GNUC__ - #define G_GNUC_FUNCTION __FUNCTION__ - #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ - #else /* !__GNUC__ */ ---- 272,278 ---- - /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with - * macros, so we can refer to them as strings unconditionally. - */ -! #if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4) - #define G_GNUC_FUNCTION __FUNCTION__ - #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ - #else /* !__GNUC__ */ diff --git a/pkgs/development/libraries/gtk+/1.2.x.nix b/pkgs/development/libraries/gtk+/1.2.x.nix deleted file mode 100644 index 9f6d8b7881e8..000000000000 --- a/pkgs/development/libraries/gtk+/1.2.x.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, x11, glib}: - -stdenv.mkDerivation { - name = "gtk+-1.2.10"; - - src = fetchurl { - url = ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz; - md5 = "4d5cb2fc7fb7830e4af9747a36bfce20"; - }; - - propagatedBuildInputs = [x11 glib]; -} |